lavc: postpone FF_API_AVCTX_TIMEBASE
There are still several decoders setting it and the situation is non-trivial to resolve.
This commit is contained in:
@@ -51,9 +51,6 @@
|
|||||||
* at once through the bump. This improves the git bisect-ability of the change.
|
* 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
|
#ifndef FF_API_CODED_FRAME
|
||||||
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
@@ -168,5 +165,8 @@
|
|||||||
#ifndef FF_API_INIT_PACKET
|
#ifndef FF_API_INIT_PACKET
|
||||||
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
|
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef FF_API_AVCTX_TIMEBASE
|
||||||
|
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* AVCODEC_VERSION_H */
|
#endif /* AVCODEC_VERSION_H */
|
||||||
|
Reference in New Issue
Block a user