diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
| commit | 64b25938e90253432d28ffd7d971f085c560a523 (patch) | |
| tree | 56ba6a39d7e8f14ebccdcc4db935164b5da624a2 /libavcodec/x86/vc1dsp_yasm.asm | |
| parent | be24f85176d8e46c3154f1f51013f235b273183e (diff) | |
| parent | ceabc13f129cd6344b1eebdbe10119083fe5520e (diff) | |
| download | ffmpeg-64b25938e90253432d28ffd7d971f085c560a523.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
dnxhdenc: add space between function argument type and comment.
x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
attributes: Add a definition of av_always_inline for MSVC
cmdutils: Pass the actual chosen encoder to filter_codec_opts
os_support: Add fallback definitions for stat flags
os_support: Rename the poll fallback function to ff_poll
network: Check for struct pollfd
os_support: Don't compare a negative number against socket descriptors
os_support: Include all the necessary headers for the win32 open function
x86: vc1: fix and enable optimised loop filter
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_yasm.asm')
| -rw-r--r-- | libavcodec/x86/vc1dsp_yasm.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/vc1dsp_yasm.asm b/libavcodec/x86/vc1dsp_yasm.asm index b897580b76..590aa509a7 100644 --- a/libavcodec/x86/vc1dsp_yasm.asm +++ b/libavcodec/x86/vc1dsp_yasm.asm @@ -119,7 +119,9 @@ section .text pand m2, m6 pand m3, m2 ; d final - PSIGNW m3, m7 + psraw m7, 15 + pxor m3, m7 + psubw m3, m7 psubw m0, m3 paddw m1, m3 packuswb m0, m0 @@ -284,7 +286,6 @@ cglobal vc1_h_loop_filter8_sse2, 3,6,8 RET %define PABSW PABSW_SSSE3 -%define PSIGNW PSIGNW_SSSE3 INIT_MMX ; void ff_vc1_v_loop_filter4_ssse3(uint8_t *src, int stride, int pq) |