diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:25:11 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:25:11 +0400 |
| commit | 85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4 (patch) | |
| tree | cc7fb01fe9ef1bf8df01163a03f22e9fcbda93bd /libavcodec/version.h | |
| parent | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (diff) | |
| parent | ca411fc1d34329cd17b28627f697e391ae52073f (diff) | |
Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
* commit 'ca411fc1d34329cd17b28627f697e391ae52073f':
avcodec: Remove broken MMI optimizations
Conflicts:
arch.mak
configure
libavcodec/avcodec.h
libavcodec/mips/Makefile
libavcodec/mips/dsputil_mmi.c
libavcodec/mips/idct_mmi.c
libavcodec/mips/mmi.h
libavcodec/mips/mpegvideo_mmi.c
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index daafb019e7..2e407ce585 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -100,5 +100,8 @@ #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 #endif /* AVCODEC_VERSION_H */ |