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/rv34dsp_init.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/rv34dsp_init.c')
-rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index 38831255c9..d91818c375 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -28,6 +28,7 @@ void ff_rv34_idct_dc_mmx2(DCTELEM *block); void ff_rv34_idct_dc_noround_mmx2(DCTELEM *block); void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); +void ff_rv34_idct_add_mmx2(uint8_t *dst, ptrdiff_t stride, DCTELEM *block); av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) { @@ -38,6 +39,7 @@ av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) c->rv34_idct_dc_add = ff_rv34_idct_dc_add_mmx; if (mm_flags & AV_CPU_FLAG_MMX2) { c->rv34_inv_transform_dc = ff_rv34_idct_dc_noround_mmx2; + c->rv34_idct_add = ff_rv34_idct_add_mmx2; } if (mm_flags & AV_CPU_FLAG_SSE4) c->rv34_idct_dc_add = ff_rv34_idct_dc_add_sse4; |