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_weight.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_weight.asm')
| -rw-r--r-- | libavcodec/x86/h264_weight.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index 26233bf080..2ad5a8f458 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -73,7 +73,7 @@ SECTION .text INIT_MMX cglobal h264_weight_16_mmx2, 6, 6, 0 WEIGHT_SETUP -.nextrow +.nextrow: WEIGHT_OP 0, 4 mova [r0 ], m0 WEIGHT_OP 8, 12 @@ -86,7 +86,7 @@ cglobal h264_weight_16_mmx2, 6, 6, 0 %macro WEIGHT_FUNC_MM 3 cglobal h264_weight_%1_%3, 6, 6, %2 WEIGHT_SETUP -.nextrow +.nextrow: WEIGHT_OP 0, mmsize/2 mova [r0], m0 add r0, r1 @@ -105,7 +105,7 @@ cglobal h264_weight_%1_%3, 6, 6, %2 WEIGHT_SETUP sar r2d, 1 lea r3, [r1*2] -.nextrow +.nextrow: WEIGHT_OP 0, r1 movh [r0], m0 %if mmsize == 16 @@ -178,7 +178,7 @@ INIT_MMX cglobal h264_biweight_16_mmx2, 7, 8, 0 BIWEIGHT_SETUP movifnidn r3d, r3m -.nextrow +.nextrow: BIWEIGHT_STEPA 0, 1, 0 BIWEIGHT_STEPA 1, 2, 4 BIWEIGHT_STEPB @@ -197,7 +197,7 @@ cglobal h264_biweight_16_mmx2, 7, 8, 0 cglobal h264_biweight_%1_%3, 7, 8, %2 BIWEIGHT_SETUP movifnidn r3d, r3m -.nextrow +.nextrow: BIWEIGHT_STEPA 0, 1, 0 BIWEIGHT_STEPA 1, 2, mmsize/2 BIWEIGHT_STEPB @@ -220,7 +220,7 @@ cglobal h264_biweight_%1_%3, 7, 8, %2 movifnidn r3d, r3m sar r3, 1 lea r4, [r2*2] -.nextrow +.nextrow: BIWEIGHT_STEPA 0, 1, 0 BIWEIGHT_STEPA 1, 2, r2 BIWEIGHT_STEPB @@ -288,7 +288,7 @@ cglobal h264_biweight_16_ssse3, 7, 8, 8 BIWEIGHT_SSSE3_SETUP movifnidn r3d, r3m -.nextrow +.nextrow: movh m0, [r0] movh m2, [r0+8] movh m3, [r1+8] @@ -309,7 +309,7 @@ cglobal h264_biweight_8_ssse3, 7, 8, 8 sar r3, 1 lea r4, [r2*2] -.nextrow +.nextrow: movh m0, [r0] movh m1, [r1] movh m2, [r0+r2] |