OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
704721b
)
swscale: add missing colons to x86 assembly yuv2planeX.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Sun, 23 Oct 2011 16:34:36 +0000
(09:34 -0700)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Sun, 23 Oct 2011 16:44:03 +0000
(09:44 -0700)
This fixes assembling using "nasm".
libswscale/x86/scale.asm
patch
|
blob
|
history
diff --git
a/libswscale/x86/scale.asm
b/libswscale/x86/scale.asm
index
c8a6916
..
9580199
100644
(file)
--- a/
libswscale/x86/scale.asm
+++ b/
libswscale/x86/scale.asm
@@
-518,7
+518,7
@@
cglobal yuv2planeX_%2_%1, %4, 7, %3
xor r5, r5
-.pixelloop
+.pixelloop
:
%assign %%i 0
; the rep here is for the 8bit output mmx case, where dither covers
; 8 pixels but we can only handle 2 pixels per register, and thus 4
@@
-541,7
+541,7
@@
cglobal yuv2planeX_%2_%1, %4, 7, %3
mova m2, m1
%endif ; %2 == 8/9/10/16
movsx cntr_reg, r1m
-.filterloop_ %+ %%i
+.filterloop_ %+ %%i
:
; input pixels
mov r6, [r2+gprsize*cntr_reg-2*gprsize]
%if %2 == 16