[SCM] libav/experimental: avcodec: Undeprecate reordered_opaque

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Aug 4 10:28:10 2014 -0700

    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 bd1b0b8..344b3e5 100644
--- 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 3569ac1..0cc8174 100644
--- 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 2c22adb..e087da3 100644
--- 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, \

-- 
Libav/FFmpeg packaging