Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:25:11 +0000 (15:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:25:11 +0000 (15:25 +0200)
commit85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4
treecc7fb01fe9ef1bf8df01163a03f22e9fcbda93bd
parentb4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2
parentca411fc1d34329cd17b28627f697e391ae52073f
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>
Makefile
arch.mak
configure
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mips/Makefile
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/options_table.h
libavcodec/version.h