Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'

* commit '435c2a31ad5eead20eda1152097f60c3bfa22847': lavf: remove disabled FF_API_READ_PACKET cruft Conflicts: libavformat/version.h Removial postponed as wraper is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 256e1f7bdf
parent 1c60956c80 435c2a31ad
commit 256e1f7bdf
1 changed files with 1 additions and 1 deletions
--- a/libavformat/version.h
+++ b/libavformat/version.h
@ -71,7 +71,7 @@
 #define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_INTERLEAVE_PACKET
 #define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)