summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-04-04 13:01:58 +0200
committerAnton Khirnov <anton@khirnov.net>2021-04-08 11:03:15 +0200
commit6ad79047a7de58d0c9d3372096908d9323dd2400 (patch)
tree534ddc07c0f333a9b13e9e1fe5627e844f8ce4cd
parent270ddc2baf8a4533255e770e8e23b2a7cc399026 (diff)
lavc: postpone FF_API_AVCTX_TIMEBASE
There are still several decoders setting it and the situation is non-trivial to resolve.
-rw-r--r--libavcodec/version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 1444c19552..83ebba22d9 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -51,9 +51,6 @@
* at once through the bump. This improves the git bisect-ability of the change.
*/
-#ifndef FF_API_AVCTX_TIMEBASE
-#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
#ifndef FF_API_CODED_FRAME
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
@@ -168,5 +165,8 @@
#ifndef FF_API_INIT_PACKET
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
#endif
+#ifndef FF_API_AVCTX_TIMEBASE
+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)
+#endif
#endif /* AVCODEC_VERSION_H */