[FFmpeg-cvslog] swscale: make %rep unconditional.

Ronald S. Bultje git at videolan.org
Mon Mar 5 00:28:55 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Mar  3 14:15:32 2012 -0800| [dccb2cd3f9d40198e319dd70cbe997b377541a10] | committer: Ronald S. Bultje

swscale: make %rep unconditional.

Fixes pre-processing with latest versions of nasm.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dccb2cd3f9d40198e319dd70cbe997b377541a10
---

 libswscale/x86/output.asm |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index 4f15ec9..68dbf51 100644
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -131,8 +131,12 @@ cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset
     ; pixels per iteration. In order to not have to keep track of where
     ; we are w.r.t. dithering, we unroll the mmx/8bit loop x2.
 %if %1 == 8
-%rep 16/mmsize
-%endif ; %1 == 8
+%assign %%repcnt 16/mmsize
+%else
+%assign %%repcnt 1
+%endif
+
+%rep %%repcnt
 
 %if %1 == 8
 %if ARCH_X86_32
@@ -226,10 +230,9 @@ cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset
 
     add             r5,  mmsize/2
     sub             wd,  mmsize/2
-%if %1 == 8
+
 %assign %%i %%i+2
 %endrep
-%endif ; %1 == 8
     jg .pixelloop
 
 %if %1 == 8



More information about the ffmpeg-cvslog mailing list