[FFmpeg-devel] [PATCH] swscale/x86/swscale: Remove superfluous and invalid '; '

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Fri Jan 21 23:26:43 EET 2022


Inside a function an unnecessary ';' is just a null statement;
yet outside of it it is actually illegal (but compilers happen
to accept it without warning except when using -pedantic).
So modify the macros to always expect the user to add a ';'.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libswscale/x86/swscale.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index 3cf0c419fd..73869355b8 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -384,7 +384,7 @@ YUV2GBRP_FN_DECL(gbrp14be,   opt); \
 YUV2GBRP_FN_DECL(gbrp16be,   opt); \
 YUV2GBRP_FN_DECL(gbrap16be,  opt); \
 YUV2GBRP_FN_DECL(gbrpf32be,  opt); \
-YUV2GBRP_FN_DECL(gbrapf32be, opt);
+YUV2GBRP_FN_DECL(gbrapf32be, opt)
 
 YUV2GBRP_DECL(sse2);
 YUV2GBRP_DECL(sse4);
@@ -405,35 +405,35 @@ void ff_planar_##fmt##_to_a_##opt(uint8_t *dst,                            \
 
 #define INPUT_PLANAR_RGBXX_A_DECL(fmt, opt) \
 INPUT_PLANAR_RGB_A_FN_DECL(fmt##le,  opt);  \
-INPUT_PLANAR_RGB_A_FN_DECL(fmt##be,  opt);
+INPUT_PLANAR_RGB_A_FN_DECL(fmt##be,  opt)
 
 #define INPUT_PLANAR_RGBXX_Y_DECL(fmt, opt) \
 INPUT_PLANAR_RGB_Y_FN_DECL(fmt##le,  opt);  \
-INPUT_PLANAR_RGB_Y_FN_DECL(fmt##be,  opt);
+INPUT_PLANAR_RGB_Y_FN_DECL(fmt##be,  opt)
 
 #define INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt) \
 INPUT_PLANAR_RGB_UV_FN_DECL(fmt##le,  opt);  \
-INPUT_PLANAR_RGB_UV_FN_DECL(fmt##be,  opt);
+INPUT_PLANAR_RGB_UV_FN_DECL(fmt##be,  opt)
 
 #define INPUT_PLANAR_RGBXX_YUVA_DECL(fmt, opt) \
 INPUT_PLANAR_RGBXX_Y_DECL(fmt,  opt);          \
 INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt);          \
-INPUT_PLANAR_RGBXX_A_DECL(fmt,  opt);
+INPUT_PLANAR_RGBXX_A_DECL(fmt,  opt)
 
 #define INPUT_PLANAR_RGBXX_YUV_DECL(fmt, opt) \
 INPUT_PLANAR_RGBXX_Y_DECL(fmt,  opt);         \
-INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt);
+INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt)
 
 #define INPUT_PLANAR_RGBXX_UVA_DECL(fmt, opt) \
 INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt);         \
-INPUT_PLANAR_RGBXX_A_DECL(fmt,  opt);
+INPUT_PLANAR_RGBXX_A_DECL(fmt,  opt)
 
 #define INPUT_PLANAR_RGB_A_ALL_DECL(opt) \
 INPUT_PLANAR_RGB_A_FN_DECL(rgb,   opt);  \
 INPUT_PLANAR_RGBXX_A_DECL(rgb10,  opt);  \
 INPUT_PLANAR_RGBXX_A_DECL(rgb12,  opt);  \
 INPUT_PLANAR_RGBXX_A_DECL(rgb16,  opt);  \
-INPUT_PLANAR_RGBXX_A_DECL(rgbf32, opt);
+INPUT_PLANAR_RGBXX_A_DECL(rgbf32, opt)
 
 #define INPUT_PLANAR_RGB_Y_ALL_DECL(opt) \
 INPUT_PLANAR_RGB_Y_FN_DECL(rgb,   opt);  \
@@ -442,7 +442,7 @@ INPUT_PLANAR_RGBXX_Y_DECL(rgb10,  opt);  \
 INPUT_PLANAR_RGBXX_Y_DECL(rgb12,  opt);  \
 INPUT_PLANAR_RGBXX_Y_DECL(rgb14,  opt);  \
 INPUT_PLANAR_RGBXX_Y_DECL(rgb16,  opt);  \
-INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, opt);
+INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, opt)
 
 #define INPUT_PLANAR_RGB_UV_ALL_DECL(opt) \
 INPUT_PLANAR_RGB_UV_FN_DECL(rgb,    opt); \
@@ -451,7 +451,7 @@ INPUT_PLANAR_RGBXX_UV_DECL(rgb10,  opt);  \
 INPUT_PLANAR_RGBXX_UV_DECL(rgb12,  opt);  \
 INPUT_PLANAR_RGBXX_UV_DECL(rgb14,  opt);  \
 INPUT_PLANAR_RGBXX_UV_DECL(rgb16,  opt);  \
-INPUT_PLANAR_RGBXX_UV_DECL(rgbf32, opt);
+INPUT_PLANAR_RGBXX_UV_DECL(rgbf32, opt)
 
 INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, sse2);
 INPUT_PLANAR_RGB_UV_ALL_DECL(sse2);
-- 
2.32.0



More information about the ffmpeg-devel mailing list