diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:29:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:29:04 +0100 |
| commit | 5753e3490696bb65dc8a865a5256933f370753aa (patch) | |
| tree | 6d822a496a3fe6ef32788dae5a1af8b0d946d226 /libavcodec/version.h | |
| parent | a8c077732598dffe6cf32fc5d6eb8adcffd5c1f7 (diff) | |
| parent | fcb07e8b332bbd6f9558bff98ff5102c5f2d8252 (diff) | |
Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'
* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
lavc: remove disabled FF_API_MMI cruft
Conflicts:
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 4825161e42..cf8f6b52d8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_MMI -#define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_IDCT #define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) #endif |