diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
| commit | 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e (patch) | |
| tree | 38b5f7b209f392584c6829a0dd1fd84a9b70bec1 /libavcodec/x86/h264_intrapred.asm | |
| parent | cc0dc50d027b8aca27b07ef5cededde2e9d96d57 (diff) | |
| parent | b4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_intrapred.asm')
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index a9da6a19db..a178a335ed 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -2611,12 +2611,11 @@ cglobal pred4x4_down_left_mmxext, 3,3 punpckldq m1, [r1] movq m2, m1 movq m3, m1 - movq m4, m1 psllq m1, 8 pxor m2, m1 psrlq m2, 8 - pxor m3, m2 - PRED4x4_LOWPASS m0, m1, m3, m4, m5 + pxor m2, m3 + PRED4x4_LOWPASS m0, m1, m2, m3, m4 lea r1, [r0+r2*2] psrlq m0, 8 movd [r0+r2*1], m0 |