History

x86/vf_blend: fix warnings about trailing empty parameters

Finishes fixing ticket #8771

James Almer committed 6 years ago

Commit 320694f1 parent 2c844c91 file · +17 −17Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/x86/vf_blend.asm+17−17
@@ -38,11 +38,11 @@ pb_255: times 16 db 255 · 37 unmodified lines
3838
3939 SECTION .text
4040
41−%macro BLEND_INIT 2-3
41+%macro BLEND_INIT 2-3 0
4242 %if ARCH_X86_64
4343 cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x
4444 mov widthd, dword widthm
45− %if %0 == 3; is 16 bit
45+ %if %3; is 16 bit
4646 add widthq, widthq ; doesn't compile on x86_32
4747 %endif
4848 %else
@@ -66,7 +66,7 @@ cglobal blend_%1, 5, 7, %2, top, top_linesize, bottom, bottom_linesize, dst, end · 17 unmodified lines
6666 REP_RET
6767 %endmacro
6868
69−%macro BLEND_SIMPLE 2-3
69+%macro BLEND_SIMPLE 2-3 0
7070 BLEND_INIT %1, 2, %3
7171 .nextrow:
7272 mov xq, widthq
@@ -82,10 +82,10 @@ BLEND_END · 9 unmodified lines
8282 %endmacro
8383
8484 ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
85−%macro GRAINEXTRACT 3-4
85+%macro GRAINEXTRACT 3-4 0
8686 BLEND_INIT %1, 6, %4
8787 pxor m4, m4
88−%if %0 == 4 ; 16 bit
88+%if %4 ; 16 bit
8989 VBROADCASTI128 m5, [pd_32768]
9090 %else
9191 VBROADCASTI128 m5, [pw_128]
@@ -182,7 +182,7 @@ BLEND_END · 90 unmodified lines
182182 %endmacro
183183
184184 ;%1 name, %2 (b or w), %3 (set if 16 bit)
185−%macro AVERAGE 2-3
185+%macro AVERAGE 2-3 0
186186 BLEND_INIT %1, 3, %3
187187 pcmpeqb m2, m2
188188
@@ -203,10 +203,10 @@ BLEND_END · 14 unmodified lines
203203 %endmacro
204204
205205 ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
206−%macro GRAINMERGE 3-4
206+%macro GRAINMERGE 3-4 0
207207 BLEND_INIT %1, 6, %4
208208 pxor m4, m4
209−%if %0 == 4 ; 16 bit
209+%if %4 ; 16 bit
210210 VBROADCASTI128 m5, [pd_32768]
211211 %else
212212 VBROADCASTI128 m5, [pw_128]
@@ -288,7 +288,7 @@ BLEND_INIT divide, 4 · 75 unmodified lines
288288 BLEND_END
289289 %endmacro
290290
291−%macro PHOENIX 2-3
291+%macro PHOENIX 2-3 0
292292 ; %1 name, %2 b or w, %3 (opt) 1 if 16 bit
293293 BLEND_INIT %1, 4, %3
294294 VBROADCASTI128 m3, [pb_255]
@@ -311,7 +311,7 @@ BLEND_END · 16 unmodified lines
311311 %endmacro
312312
313313 ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
314−%macro DIFFERENCE 3-4
314+%macro DIFFERENCE 3-4 0
315315 BLEND_INIT %1, 5, %4
316316 pxor m2, m2
317317 .nextrow:
@@ -326,7 +326,7 @@ BLEND_INIT %1, 5, %4 · 8 unmodified lines
326326 punpckl%2%3 m1, m2
327327 psub%3 m0, m1
328328 psub%3 m3, m4
329−%if %0 == 4; 16 bit
329+%if %4; 16 bit
330330 pabsd m0, m0
331331 pabsd m3, m3
332332 %else
@@ -340,10 +340,10 @@ BLEND_END · 7 unmodified lines
340340 %endmacro
341341
342342 ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
343−%macro EXTREMITY 3-4
343+%macro EXTREMITY 3-4 0
344344 BLEND_INIT %1, 8, %4
345345 pxor m2, m2
346−%if %0 == 4; 16 bit
346+%if %4; 16 bit
347347 VBROADCASTI128 m4, [pd_65535]
348348 %else
349349 VBROADCASTI128 m4, [pw_255]
@@ -362,7 +362,7 @@ BLEND_INIT %1, 8, %4 · 12 unmodified lines
362362 psub%3 m7, m4, m5
363363 psub%3 m3, m1
364364 psub%3 m7, m6
365−%if %0 == 4; 16 bit
365+%if %4; 16 bit
366366 pabsd m3, m3
367367 pabsd m7, m7
368368 %else
@@ -375,10 +375,10 @@ BLEND_INIT %1, 8, %4 · 6 unmodified lines
375375 BLEND_END
376376 %endmacro
377377
378−%macro NEGATION 3-4
378+%macro NEGATION 3-4 0
379379 BLEND_INIT %1, 8, %4
380380 pxor m2, m2
381−%if %0 == 4; 16 bit
381+%if %4; 16 bit
382382 VBROADCASTI128 m4, [pd_65535]
383383 %else
384384 VBROADCASTI128 m4, [pw_255]
@@ -397,7 +397,7 @@ BLEND_INIT %1, 8, %4 · 12 unmodified lines
397397 psub%3 m7, m4, m5
398398 psub%3 m3, m1
399399 psub%3 m7, m6
400−%if %0 == 4; 16 bit
400+%if %4; 16 bit
401401 pabsd m3, m3
402402 pabsd m7, m7
403403 %else

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t