summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-09 22:35:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-09 23:19:16 +0200
commitc89afc9acfc739dabe93f109f0635e242a767355 (patch)
treea9a5b7e313649a02fa66644c21e63c02b95bdd06
parent889cb3ae2375d9cd7c3174fe47fecacc2eb57787 (diff)
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 <michaelni@gmx.at>
-rw-r--r--libavcodec/version.h4
-rw-r--r--libavutil/version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b698de21ff..7245b15a91 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 190d3978be..c30b11d519 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)