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_deblock_10bit.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_deblock_10bit.asm')
| -rw-r--r-- | libavcodec/x86/h264_deblock_10bit.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index d625eee4a4..8a6bbb9d9e 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -625,7 +625,7 @@ cglobal deblock_v_luma_intra_10, 4,7,16 shl r2d, 2 shl r3d, 2 LOAD_AB aa, bb, r2d, r3d -.loop +.loop: mova p2, [r4+r1] mova p1, [r4+2*r1] mova p0, [r4+r5] @@ -676,7 +676,7 @@ cglobal deblock_h_luma_intra_10, 4,7,16 mova m0, [pw_2] shl r2d, 2 shl r3d, 2 -.loop +.loop: movu q3, [r0-8] movu q2, [r0+r1-8] movu q1, [r0+r1*2-8] |