Commit c89afc9a authored by Michael Niedermayer's avatar Michael Niedermayer

delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO

This prevents a build failure when bumping.
the uses could easily be updated / removed, if people prefer.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 889cb3ae
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_OLD_ENCODE_VIDEO #ifndef FF_API_OLD_ENCODE_VIDEO
#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_CODEC_ID #ifndef FF_API_CODEC_ID
#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_AUDIO_CONVERT #ifndef FF_API_AUDIO_CONVERT
#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 56)
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54) #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_OLD_AVOPTIONS #ifndef FF_API_OLD_AVOPTIONS
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 54) #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_PIX_FMT #ifndef FF_API_PIX_FMT
#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55) #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment