Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 01:39:41 +0000 (02:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 01:55:42 +0000 (02:55 +0100)
commite25ed2608c960302d6f4832a5435c9672d78e282
treec1a47f794e12416578691bc9d53c36db5e33d150
parenta7663ad9cf74bb0a25c07085e7a8f2b235d0c0cb
parentc7f7bfc9e3a3150ba72bc34366c13fb2210c66ac
Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'

* commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac':
  Remove all Alpha architecture optimizations

Conflicts:
libavcodec/alpha/asm.h
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/alpha/motion_est_alpha.c
libavcodec/alpha/motion_est_mvi_asm.S
libavcodec/alpha/mpegvideo_alpha.c
libavcodec/alpha/regdef.h
libavcodec/alpha/simple_idct_alpha.c

We have a qemu based fate alpha client. And various failures
on alpha have previously pointed to issues in generic C code.
Thus IMHO it makes sense to keep alpha code as long as someone
is willing to do the little bit of maintaince it needs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/dct-test.c
libavcodec/msmpeg4.c
libavcodec/options_table.h
libavcodec/version.h