summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2018-10-25 15:41:26 +0300
committerMartin Storsjö <martin@martin.st>2018-11-05 15:52:08 +0200
commit4e9cff2824769e792c7867b09e1efb67278abe79 (patch)
treefc0a474eac5e6dfb58ccd491be180055d2417ccf
parent89a0d33e3a53e8edefd734b131a7035d13052947 (diff)
downloadffmpeg-streaming-4e9cff2824769e792c7867b09e1efb67278abe79.zip
ffmpeg-streaming-4e9cff2824769e792c7867b09e1efb67278abe79.tar.gz
libavutil: Undeprecate the AVFrame reordered_opaque field
This was marked as deprecated (but only in the doxygen, not with an actual deprecation attribute) in 81c623fae05 in 2011, but was undeprecated in ad1ee5fa7. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavutil/frame.h1
-rw-r--r--libavutil/version.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h
index e2a2929..66f27f4 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -389,7 +389,6 @@ typedef struct AVFrame {
* that time,
* the decoder reorders values as needed and sets AVFrame.reordered_opaque
* to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
- * @deprecated in favor of pkt_pts
*/
int64_t reordered_opaque;
diff --git a/libavutil/version.h b/libavutil/version.h
index 161e3f1..adbf596 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 23
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
OpenPOWER on IntegriCloud