diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:04:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:04:55 +0200 |
| commit | 2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6 (patch) | |
| tree | 23a8f9c41f97be5cf9cdfd406575fa9ac9461b75 /libavcodec/x86/h264_intrapred.asm | |
| parent | 2da5a5ce00caebbe3afbda8612588966cfeac477 (diff) | |
| parent | edd82267958fbbd34eca4f4dbfb96197b9b40ab5 (diff) | |
| download | ffmpeg-2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fix build with nasm 2.08
x86: use nop cpu directives only if supported
x86: fix rNmp macros with nasm
build: add trailing / to yasm/nasm -I flags
x86: use 32-bit source registers with movd instruction
x86: add colons after labels
Conflicts:
Makefile
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_intrapred.asm')
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index fd78456294..609cb2303d 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -484,7 +484,7 @@ cglobal pred16x16_plane_%1, 2,9,7 %endif mov r4, 8 -.loop +.loop: mova m3, m0 ; b[0..7] mova m4, m2 ; b[8..15] psraw m3, 5 @@ -680,7 +680,7 @@ cglobal pred8x8_plane, 2,9,7 mov r4, 4 ALIGN 16 -.loop +.loop: %if mmsize == 16 mova m3, m0 ; b[0..7] paddw m0, m1 @@ -1045,7 +1045,7 @@ cglobal pred8x8l_top_dc_%1, 4,4 psrlq mm5, 56 psllq mm5, 56 pxor mm1, mm5 -.body +.body: PRED4x4_LOWPASS mm0, mm2, mm1, mm3, mm5 psadbw mm7, mm0 paddw mm7, [pw_4] @@ -1141,7 +1141,7 @@ cglobal pred8x8l_dc_%1, 4,5 jz .fix_lt_2 test r2, r2 jz .fix_tr_1 -.body +.body: lea r1, [r0+r3*2] PRED4x4_LOWPASS mm6, mm2, mm1, mm3, mm5 pxor mm0, mm0 @@ -1276,7 +1276,7 @@ cglobal pred8x8l_vertical_%1, 4,4 psrlq mm5, 56 psllq mm5, 56 pxor mm1, mm5 -.body +.body: PRED4x4_LOWPASS mm0, mm2, mm1, mm3, mm5 %rep 3 movq [r0+r3*1], mm0 @@ -1576,7 +1576,7 @@ cglobal pred8x8l_down_right_mmxext, 4,5 psllq mm5, 56 pxor mm1, mm5 jmp .do_top -.body +.body: lea r1, [r0+r3*2] movq mm1, mm7 movq mm7, mm5 @@ -1822,7 +1822,7 @@ cglobal pred8x8l_vertical_right_mmxext, 4,5 jz .fix_lt_2 test r2, r2 jz .fix_tr_1 -.do_top +.do_top: PRED4x4_LOWPASS mm6, mm2, mm1, mm3, mm5 lea r1, [r0+r3*2] movq mm2, mm6 @@ -1931,7 +1931,7 @@ cglobal pred8x8l_vertical_right_%1, 4,5,7 jz .fix_lt_2 test r2, r2 jz .fix_tr_1 -.do_top +.do_top: PRED4x4_LOWPASS mm6, mm2, mm1, mm3, mm5 lea r1, [r0+r3*2] movq2dq xmm4, mm6 |