diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
| commit | a1b5c9634e87160251fd41635beb01da157cf00c (patch) | |
| tree | a62b214125e71d0f6a0a7ce910100a3641cc010e /libavcodec/x86/vp3dsp_init.c | |
| parent | b0c543b1deba77647911be159b013760b5d05db3 (diff) | |
| parent | 26301caaa1aec5d71b564bff452147d6183370bf (diff) | |
| download | ffmpeg-a1b5c9634e87160251fd41635beb01da157cf00c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: mmx2 ---> mmxext in asm constructs
Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vp3dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vp3dsp_init.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c index c4d462bc62..eddfd07265 100644 --- a/libavcodec/x86/vp3dsp_init.c +++ b/libavcodec/x86/vp3dsp_init.c @@ -31,11 +31,13 @@ void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block); -void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int line_size, - const DCTELEM *block); +void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, int line_size, + const DCTELEM *block); -void ff_vp3_v_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values); -void ff_vp3_h_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values); +void ff_vp3_v_loop_filter_mmxext(uint8_t *src, int stride, + int *bounding_values); +void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride, + int *bounding_values); av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) { @@ -50,11 +52,11 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) #endif if (EXTERNAL_MMXEXT(cpuflags)) { - c->idct_dc_add = ff_vp3_idct_dc_add_mmx2; + c->idct_dc_add = ff_vp3_idct_dc_add_mmxext; if (!(flags & CODEC_FLAG_BITEXACT)) { - c->v_loop_filter = ff_vp3_v_loop_filter_mmx2; - c->h_loop_filter = ff_vp3_h_loop_filter_mmx2; + c->v_loop_filter = ff_vp3_v_loop_filter_mmxext; + c->h_loop_filter = ff_vp3_h_loop_filter_mmxext; } } |