[FFmpeg-cvslog] lavc: postpone FF_API_AVCTX_TIMEBASE

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Apr  4 13:01:58 2021 +0200| [6ad79047a7de58d0c9d3372096908d9323dd2400] | committer: Anton Khirnov

lavc: postpone FF_API_AVCTX_TIMEBASE

There are still several decoders setting it and the situation is
non-trivial to resolve.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ad79047a7de58d0c9d3372096908d9323dd2400
---

 libavcodec/version.h | 6 +++---
 1 file 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 */