avcodec: Undeprecate reordered_opaque

It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts.  There is no way to cleanly achieve this
without the field.

diff --git a/doc/APIchanges b/doc/APIchanges
index bd1b0b89ecd3b1dac6f358378102173d9440eefd..344b3e56b6c82e504434a287c5f44448c927e43c 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil:     2013-12-xx
 
 API changes, most recent first:
 
+2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
+  reordered_opaque is not going to be removed in the future.
+
 2014-08-xx - xxxxxxx - lavu 53.22.0 - pixfmt.h
   Add AV_PIX_FMT_YA16 pixel format for 16 bit packed gray with alpha.
 

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3569ac15d1a2d4a02f37c693a55b67a0b82e216d..0cc81749b05be3a4e2534e7c52901881f541019b 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2413,7 +2413,6 @@ typedef struct AVCodecContext {
     /**
      * opaque 64bit number (generally a PTS) that will be reordered and
      * output in AVFrame.reordered_opaque
-     * @deprecated in favor of pkt_pts
      * - encoding: unused
      * - decoding: Set by user.
      */

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2c22adb35d6bf204c4aa74b43ee1cbd617d4ec68..e087da39d7974270d82d2f21f62ecd95f208e451 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR 57
-#define LIBAVCODEC_VERSION_MICRO  2
+#define LIBAVCODEC_VERSION_MICRO  3
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \