diff mbox series

[FFmpeg-devel,05/17] lavc: postpone FF_API_AVCTX_TIMEBASE

Message ID 20210405110952.17679-6-anton@khirnov.net
State Accepted
Commit 6ad79047a7de58d0c9d3372096908d9323dd2400
Headers show
Series [FFmpeg-devel,01/17] lavu: postpone child_class_next API removal | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Anton Khirnov April 5, 2021, 11:09 a.m. UTC 
There are still several decoders setting it and the situation is
non-trivial to resolve.
---
 libavcodec/version.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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 */