From 6ad79047a7de58d0c9d3372096908d9323dd2400 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 4 Apr 2021 13:01:58 +0200 Subject: [PATCH] lavc: postpone FF_API_AVCTX_TIMEBASE 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 --git a/libavcodec/version.h b/libavcodec/version.h index 1444c195522..83ebba22d9e 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 */ -- 2.39.2