Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d': avcodec: Undeprecate reordered_opaque Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · a561662fb7
parent 2bf87dcc2d ad1ee5fa75
commit a561662fb7
3 changed files with 4 additions and 2 deletions
--- a/doc/APIchanges
+++ b/doc/APIchanges
@ -15,6 +15,9 @@ libavutil:     2012-10-22

 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-02 - xxxxxxx - lavu 52.98.100 - pixelutils.h
  Add pixelutils API with SAD functions

--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -2613,7 +2613,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.
     */
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@ -30,7 +30,7 @@

 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR  73
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                               LIBAVCODEC_VERSION_MINOR, \