diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
| commit | 1f27053b91e4f0b1f6571448db9e363fd84e65b6 (patch) | |
| tree | 80a21139597213277feb0fa99a3006d4a1b800dd /libavcodec/version.h | |
| parent | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (diff) | |
| parent | de27d2b92fa97deb2856d18e9f5f19586ce45a0f (diff) | |
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index fc89592c2f..3fa2d51785 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -73,9 +73,6 @@ #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_LIBMPEG2 -#define FF_API_LIBMPEG2 (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_MMI #define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) #endif |