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/avcodec.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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5837b8d8e0..1423bef50a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2509,9 +2509,6 @@ typedef struct AVCodecContext { #define FF_IDCT_INT 1 #define FF_IDCT_SIMPLE 2 #define FF_IDCT_SIMPLEMMX 3 -#if FF_API_MMI -#define FF_IDCT_MMI 5 -#endif #define FF_IDCT_ARM 7 #define FF_IDCT_ALTIVEC 8 #define FF_IDCT_SH4 9 |