diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
| commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
| tree | dc114d719849d6c3645063e02378dfddecbc991a /libavcodec/x86/h264_intrapred.asm | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
| download | ffmpeg-ca19862d3879dfadfd6c1a1a443eac40fc433385.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_intrapred.asm')
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index f97d051865..b5d45ddf48 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -289,7 +289,7 @@ cglobal pred16x16_tm_vp8_sse2, 2,6,6 ;----------------------------------------------------------------------------- %macro H264_PRED16x16_PLANE 3 -cglobal pred16x16_plane_%3_%1, 2, 7, %2 +cglobal pred16x16_plane_%3_%1, 2, 9, %2 mov r2, r1 ; +stride neg r1 ; -stride @@ -349,7 +349,7 @@ cglobal pred16x16_plane_%3_%1, 2, 7, %2 add r4, r2 %if ARCH_X86_64 -%define e_reg r11 +%define e_reg r8 %else %define e_reg r0 %endif @@ -370,8 +370,8 @@ cglobal pred16x16_plane_%3_%1, 2, 7, %2 movzx e_reg, byte [r3 ] %if ARCH_X86_64 - movzx r10, byte [r4+r2 ] - sub r10, e_reg + movzx r7, byte [r4+r2 ] + sub r7, e_reg %else movzx r6, byte [r4+r2 ] sub r6, e_reg @@ -386,7 +386,7 @@ cglobal pred16x16_plane_%3_%1, 2, 7, %2 movzx r6, byte [r3 ] sub r6, r4 %if ARCH_X86_64 - lea r6, [r10+r6*2] + lea r6, [r7+r6*2] lea r5, [r5+r6*2] add r5, r6 %else @@ -396,9 +396,9 @@ cglobal pred16x16_plane_%3_%1, 2, 7, %2 movzx r4, byte [e_reg ] %if ARCH_X86_64 - movzx r10, byte [r3 +r2 ] - sub r10, r4 - sub r5, r10 + movzx r7, byte [r3 +r2 ] + sub r7, r4 + sub r5, r7 %else movzx r6, byte [r3 +r2 ] sub r6, r4 @@ -410,7 +410,7 @@ cglobal pred16x16_plane_%3_%1, 2, 7, %2 movzx r6, byte [r3 +r2*2] sub r6, r4 %if ARCH_X86_64 - add r6, r10 + add r6, r7 %endif lea r5, [r5+r6*8] @@ -588,7 +588,7 @@ H264_PRED16x16_PLANE ssse3, 8, svq3 ;----------------------------------------------------------------------------- %macro H264_PRED8x8_PLANE 2 -cglobal pred8x8_plane_%1, 2, 7, %2 +cglobal pred8x8_plane_%1, 2, 9, %2 mov r2, r1 ; +stride neg r1 ; -stride @@ -642,7 +642,7 @@ cglobal pred8x8_plane_%1, 2, 7, %2 add r4, r2 %if ARCH_X86_64 -%define e_reg r11 +%define e_reg r8 %else %define e_reg r0 %endif @@ -653,9 +653,9 @@ cglobal pred8x8_plane_%1, 2, 7, %2 movzx e_reg, byte [r3 ] %if ARCH_X86_64 - movzx r10, byte [r4+r2 ] - sub r10, e_reg - sub r5, r10 + movzx r7, byte [r4+r2 ] + sub r7, e_reg + sub r5, r7 %else movzx r6, byte [r4+r2 ] sub r6, e_reg @@ -667,7 +667,7 @@ cglobal pred8x8_plane_%1, 2, 7, %2 movzx r6, byte [r4+r2*2 ] sub r6, e_reg %if ARCH_X86_64 - add r6, r10 + add r6, r7 %endif lea r5, [r5+r6*4] |