aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-08-21 11:46:49 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-08-21 13:52:44 +0200
commitc5e204c84f98cba85f0bc22bf1719adff8619533 (patch)
tree752f99c7534db6faea6f7c6b92de7ba496352ebd
parentbbe92ed9b1122437dfa3120338b36816523cc491 (diff)
downloadffmpeg-c5e204c84f98cba85f0bc22bf1719adff8619533.tar.gz
avfilter/vf_overlay: Remove superfluous ;
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>
-rw-r--r--libavfilter/vf_overlay.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index b3a1ac1a09..79c654bb2d 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -595,8 +595,8 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
dap += (1 << vsub) * dst->linesize[3] / bytes; \
} \
}
-DEFINE_BLEND_PLANE(8, 8);
-DEFINE_BLEND_PLANE(16, 10);
+DEFINE_BLEND_PLANE(8, 8)
+DEFINE_BLEND_PLANE(16, 10)
#define DEFINE_ALPHA_COMPOSITE(depth, nbits) \
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; \
} \
}
-DEFINE_ALPHA_COMPOSITE(8, 8);
-DEFINE_ALPHA_COMPOSITE(16, 10);
+DEFINE_ALPHA_COMPOSITE(8, 8)
+DEFINE_ALPHA_COMPOSITE(16, 10)
#define DEFINE_BLEND_SLICE_YUV(depth, nbits) \
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, \
jobnr, nb_jobs); \
}
-DEFINE_BLEND_SLICE_YUV(8, 8);
-DEFINE_BLEND_SLICE_YUV(16, 10);
+DEFINE_BLEND_SLICE_YUV(8, 8)
+DEFINE_BLEND_SLICE_YUV(16, 10)
static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,
AVFrame *dst, const AVFrame *src,