Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'

* commit 'c692957c4edd119920cd7f2121628dd183589e6a': lavu: remove disabled avoptions cruft lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · d0ac26a264
parent a65bc2712d c692957c4e
commit d0ac26a264
1 changed files with 2 additions and 2 deletions
--- a/libavutil/version.h
+++ b/libavutil/version.h
@ -103,10 +103,10 @@
 #define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
 #endif
 #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_AV_FIFO_PEEK
 #define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)