From patchwork Fri Aug 21 10:17:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21794 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 356DB4491F1 for ; Fri, 21 Aug 2020 13:23:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 145C968B42B; Fri, 21 Aug 2020 13:23:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C7E268A9D5 for ; Fri, 21 Aug 2020 13:23:26 +0300 (EEST) Received: by mail-ej1-f65.google.com with SMTP id t10so1677652ejs.8 for ; Fri, 21 Aug 2020 03:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L3ugRw9d4ktujEFgRHMAcAl0Iys6dVJp14zlbahU4Bw=; b=Q4AOeVGw/P31SyXBCX34LFRa91Sglvc4DL5l2HaA4TMdByJHi0kG9Zjq72EvF4cQJr B7sv1O4mxsw5nD1dALoRYWIu3XgaTZqeN48/oUqw5Vd2Oh7WyfCRQnOO+l3GRagxVyxf jgCHXcb3nD7S+P4QTXUfyu5/apgxWRGyZ2O5C8SdNH8fDMj63uoibVDG5m6rosqWB2x4 igwIuMToLvz0+atX5NHx+bByGUfh3xfGlRKsbb/CTIF9B4HupfQY8TxM5C7785ev58XG 4YJeW9bwesYshcUTWeN8xsQy4NjyK81BM+7sPV9AZ4e9+BwDShTCqs60HB7u8JBCXDK8 utbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L3ugRw9d4ktujEFgRHMAcAl0Iys6dVJp14zlbahU4Bw=; b=cCVdcu+9uGSuZ3Q0U/IgwAX+bHdmTsEpdjd9/e+OPaeKLvogk08nlv0mpvvAK7/fF3 6Tz0IXgshIv1IMflaOylUmsyQTbBc+p2hUNHakmdxVmFI9uGVyhCKssXZuqjFTnr5Cbd CiOCTxdk2OHb2r6p9K6IZdtrRf4Lh/Z1kQH/sHrXLajJtqzRfcO/wC5y3CV/vdOqafM5 sOsbvx2/WggckPlJ8givtUUKCnjd6wPIeCgvvmVALtJuU1cli3y/rYH385xTxxogqoHO WZc4h9I40WXXgJMuU0ZP/GTL52jIedLJBt2RTkAeZt216A7GUGP7aGnbyOUCBqiAV9mX //6g== X-Gm-Message-State: AOAM530UvQQQC6GF8pz9W//qe915eLFLoBvZNjS6GTzKSRJUraGBSU3a PYBzlFstmijpbDciXLoCWC9Nrq1KLS0= X-Google-Smtp-Source: ABdhPJy4XemzdrY0ALpPh7mt7ou3HsAFeqmIGskeX9yHift2+EuwidLFQnEEh3cnlzwr8pnbR1AkPg== X-Received: by 2002:a17:906:d786:: with SMTP id pj6mr2108013ejb.261.1598005405661; Fri, 21 Aug 2020 03:23:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id oz4sm277480ejb.106.2020.08.21.03.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 03:23:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Aug 2020 12:17:50 +0200 Message-Id: <20200821101750.27233-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200821101750.27233-1-andreas.rheinhardt@gmail.com> References: <20200821101750.27233-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_overlay: Remove superfluous ; X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_overlay.c | 12 ++++++------ 1 file 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,