From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Wed, 3 Jun 2009 11:20:35 +0000 (+0000)
Subject: Add AV_PKT_FLAG_KEY and deprecate PKT_FLAG_KEY.
X-Git-Tag: android-x86-4.4-r1~26221
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f3f2e067605b6ef537dd7aad8e0b8f4b67289ec;p=android-x86%2Fexternal-ffmpeg.git

Add AV_PKT_FLAG_KEY and deprecate PKT_FLAG_KEY.

Originally committed as revision 19078 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/doc/APIchanges b/doc/APIchanges
index c36ccfcbf8..d012139f85 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -12,6 +12,10 @@ libavutil:   2009-03-08
 
 API changes, most recent first:
 
+2009-06-03 - r19078 - lavc 52.30.2 - AV_PKT_FLAG_KEY
+  PKT_FLAG_KEY has been deprecated and will be dropped for the next
+  major version. Use AV_PKT_FLAG_KEY instead.
+
 2009-06-01 - r19025 - lavc 52.30.0 - av_lockmgr_register()
   av_lockmgr_register() can be used to register a callback function
   that lavc (and in the future, libraries that depend on lavc) can use
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 248287fb4f..c6a9f89806 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -31,7 +31,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 52
 #define LIBAVCODEC_VERSION_MINOR 30
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MICRO  2
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
@@ -950,7 +950,10 @@ typedef struct AVPacket {
      */
     int64_t convergence_duration;
 } AVPacket;
-#define PKT_FLAG_KEY   0x0001
+#define AV_PKT_FLAG_KEY   0x0001
+#if LIBAVCODEC_VERSION_MAJOR < 53
+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+#endif
 
 /**
  * Audio Video Frame.