ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Aug 9 22:35:23 2014 +0200| [c89afc9acfc739dabe93f109f0635e242a767355] | committer: 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: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c89afc9acfc739dabe93f109f0635e242a767355 --- libavcodec/version.h | 4 ++-- libavutil/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index b698de2..7245b15 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -58,10 +58,10 @@ #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56) #endif #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 #ifndef FF_API_CODEC_ID -#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_AUDIO_CONVERT #define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 56) diff --git a/libavutil/version.h b/libavutil/version.h index 190d397..c30b11d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -87,7 +87,7 @@ #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_OLD_AVOPTIONS -#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_PIX_FMT #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
