Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-04 21:28:10 +0400
committerDiego Biurrun <diego@biurrun.de>2014-08-07 15:03:00 +0400
commitad1ee5fa75a3d69d54c0691048939e94ab5a7f0d (patch)
tree90b066c8dc7facf8dfa3d77a332bf4ecdbbaf67c
parenta7e541c9926d531a100ba0d36f4e56956dd84651 (diff)
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.
-rw-r--r--doc/APIchanges3
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/version.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index bd1b0b89ec..344b3e56b6 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 3569ac15d1..0cc81749b0 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 2c22adb35d..e087da39d7 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, \