diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-29 21:45:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-29 21:45:54 +0200 |
| commit | dfa07e89289b25d44b6f2b959130077913921e0a (patch) | |
| tree | b83687405107f879c20b2ccc3dd66d6db35ae4fa /libavcodec/x86/dsputil_mmx.c | |
| parent | 46eba43e0ef28d9d08ed41774e6bd1ce94388c35 (diff) | |
| parent | acb2c79c2102026747468dcafa6780ab1094b3c5 (diff) | |
| download | ffmpeg-dfa07e89289b25d44b6f2b959130077913921e0a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
4xm: fix invalid array indexing
rv34dsp: factorize a multiplication in the noround inverse transform
rv40: perform bitwise checks in loop filter
rv34: remove inline keyword from rv34_decode_block().
rv40: change a logical test into a bitwise one.
rv34: remove constant parameter
rv40: don't always do the full prev_type search
dsputil x86: revert a test back to its previous value
rv34dsp x86: implement MMX2 inverse transform
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 4c96d62525..68df954897 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -3043,7 +3043,7 @@ static void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx, const int bit_depth = avctx->bits_per_raw_sample; const int high_bit_depth = bit_depth > 8; - if (mm_flags & AV_CPU_FLAG_3DNOW) { + if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) { // these functions are slower than mmx on AMD, but faster on Intel if (!high_bit_depth) { c->put_pixels_tab[0][0] = put_pixels16_sse2; |