diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
| commit | 06a83505992d5f49846c18507a6c3eb8a47c650e (patch) | |
| tree | dda157473729622e9797446d4b717f5dab0a9b1c /libavformat/version.h | |
| parent | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (diff) | |
| parent | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff) | |
| download | ffmpeg-06a83505992d5f49846c18507a6c3eb8a47c650e.tar.gz | |
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 58c957f6de..67ee0beb70 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -73,12 +73,6 @@ #ifndef FF_API_READ_PACKET #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) #endif -#ifndef FF_API_INTERLEAVE_PACKET -#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif -#ifndef FF_API_AV_GETTIME -#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif |