diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 02:39:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 02:55:42 +0100 |
| commit | e25ed2608c960302d6f4832a5435c9672d78e282 (patch) | |
| tree | c1a47f794e12416578691bc9d53c36db5e33d150 /libavcodec/msmpeg4.c | |
| parent | a7663ad9cf74bb0a25c07085e7a8f2b235d0c0cb (diff) | |
| parent | c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff) | |
| download | ffmpeg-e25ed2608c960302d6f4832a5435c9672d78e282.tar.gz | |
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>
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index f2110e7f3e..b071d74c92 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -240,10 +240,7 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, : "%eax", "%edx" ); #else - /* #elif ARCH_ALPHA */ - /* Divisions are extremely costly on Alpha; optimize the most - common case. But they are costly everywhere... - */ + /* Divisions are costly everywhere; optimize the most common case. */ if (scale == 8) { a = (a + (8 >> 1)) / 8; b = (b + (8 >> 1)) / 8; |