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/mpegvideo.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/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index f0fa652e89..61cc3e10de 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -776,7 +776,6 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt, void ff_dct_encode_init_x86(MpegEncContext *s); void ff_MPV_common_init_x86(MpegEncContext *s); void ff_MPV_common_init_axp(MpegEncContext *s); -void ff_MPV_common_init_mmi(MpegEncContext *s); void ff_MPV_common_init_arm(MpegEncContext *s); void ff_MPV_common_init_altivec(MpegEncContext *s); void ff_MPV_common_init_bfin(MpegEncContext *s); |