generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-07-23 16:47:10 +02:00
parent cc0dc50d02 b4cfb8254e
commit 5271b857eb
12 changed files with 751 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/x86/h264_intrapred.asm
View File

@@ -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