diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:29:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:34:06 +0100 |
| commit | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (patch) | |
| tree | 4c875e509ccb8b02c5244d2018e2ac5f41592a8d /libavformat | |
| parent | 1c60956c80376884502e797f613ec24cacba3cce (diff) | |
| parent | 435c2a31ad5eead20eda1152097f60c3bfa22847 (diff) | |
| download | ffmpeg-256e1f7bdfb0f84c7854b6e4147a8b349e12a905.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -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 9a2b90651d..58c957f6de 100644 --- 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) |