diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:12:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:18:06 +0100 |
| commit | ed80427e0ef59e45681930810aeb821a87e80710 (patch) | |
| tree | c02bbca286252598910342d2506dad25eb580d17 | |
| parent | b13cd2d86763cddd754bab204b0893d7bf7e123b (diff) | |
| parent | 0a7c4daf469d4ac447fb822fe78337f62f4c04e6 (diff) | |
| download | ffmpeg-ed80427e0ef59e45681930810aeb821a87e80710.tar.gz | |
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
Conflicts:
libavformat/version.h
removial postponed as the wraper code is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 6cf5850de8..d4a3bb3afa 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -68,7 +68,7 @@ #define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 55) #endif #ifndef FF_API_CLOSE_INPUT_FILE -#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 55) +#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56) #endif #ifndef FF_API_APPLEHTTP_PROTO #define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55) |