har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_overlay: Remove superfluous ;

Browse Source 
In a function body, a redundant ; is just a null statement that does
nothing. Yet outside a function body, a superfluous ';' like one that
exists if one adds a ';' immediately after a function body's closing
brace is actually invalid C that compilers happen to accept. Yet when
compiled in -pedantic mode, both GCC as well as Clang emit warnings for
this like "ISO C does not allow extra ‘;’ outside of a function
[-Wpedantic]".

The scenario described above existed in vf_overlay.c as a result of
macro expansion. This commit fixes it.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-08-21 11:46:49 +02:00
parent bbe92ed9b1
commit c5e204c84f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_overlay.c
View File

@ -595,8 +595,8 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
dap += (1 << vsub) * dst->linesize[3] / bytes; \ dap += (1 << vsub) * dst->linesize[3] / bytes; \
} \ } \
} }
DEFINE_BLEND_PLANE(8, 8); DEFINE_BLEND_PLANE(8, 8)
DEFINE_BLEND_PLANE(16, 10); DEFINE_BLEND_PLANE(16, 10)
#define DEFINE_ALPHA_COMPOSITE(depth, nbits) \ #define DEFINE_ALPHA_COMPOSITE(depth, nbits) \
static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \
@ -647,8 +647,8 @@ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, c
sa += src->linesize[3] / bytes; \ sa += src->linesize[3] / bytes; \
} \ } \
} }
DEFINE_ALPHA_COMPOSITE(8, 8); DEFINE_ALPHA_COMPOSITE(8, 8)
DEFINE_ALPHA_COMPOSITE(16, 10); DEFINE_ALPHA_COMPOSITE(16, 10)
#define DEFINE_BLEND_SLICE_YUV(depth, nbits) \ #define DEFINE_BLEND_SLICE_YUV(depth, nbits) \
static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \ static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \
@ -679,8 +679,8 @@ static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterCon
alpha_composite_##depth##_##nbits##bits(src, dst, src_w, src_h, dst_w, dst_h, x, y, \ alpha_composite_##depth##_##nbits##bits(src, dst, src_w, src_h, dst_w, dst_h, x, y, \
jobnr, nb_jobs); \ jobnr, nb_jobs); \
} }
DEFINE_BLEND_SLICE_YUV(8, 8); DEFINE_BLEND_SLICE_YUV(8, 8)
DEFINE_BLEND_SLICE_YUV(16, 10); DEFINE_BLEND_SLICE_YUV(16, 10)
static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx, static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,
AVFrame *dst, const AVFrame *src, AVFrame *dst, const AVFrame *src,