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/vp56dsp.asm | |
| parent | 2da5a5ce00caebbe3afbda8612588966cfeac477 (diff) | |
| parent | edd82267958fbbd34eca4f4dbfb96197b9b40ab5 (diff) | |
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/vp56dsp.asm')
| -rw-r--r-- | libavcodec/x86/vp56dsp.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/vp56dsp.asm b/libavcodec/x86/vp56dsp.asm index 21ff041d61..bc09903575 100644 --- a/libavcodec/x86/vp56dsp.asm +++ b/libavcodec/x86/vp56dsp.asm @@ -139,7 +139,7 @@ cglobal vp6_filter_diag4, 5, 7, 8 mov r3, rsp mov r6, 11 -.nextrow +.nextrow: DIAG4 r1, -1, 0, 1, 2, r3 add r3, 8 add r1, r2 @@ -151,7 +151,7 @@ cglobal vp6_filter_diag4, 5, 7, 8 lea r3, [rsp+8] mov r6, 8 -.nextcol +.nextcol: DIAG4 r3, -8, 0, 8, 16, r0 add r3, 8 add r0, r2 |