From patchwork Mon Oct 7 00:10:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15536 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 BEF4C44A484 for ; Mon, 7 Oct 2019 03:10:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B761687EEB; Mon, 7 Oct 2019 03:10:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C4BD68046A for ; Mon, 7 Oct 2019 03:10:39 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id z9so13040088wrl.11 for ; Sun, 06 Oct 2019 17:10:39 -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:mime-version :content-transfer-encoding; bh=Au7ZI6tVrnQwbn5Ke3jBgvWAFwULvZLTprf4B9KL0Kw=; b=QuUwkfWT2bUnLjwEuplhs17IHCM7tLu7RhFtUjRRQD+kfo+9SMk29DnWaWXOwASssw l9wl7RyvHiktMZ4HVV4S6WFwYjtKAwEV/jgK+Kh9uYaTfEQEviE2zGM6htv8/ggwW9DQ 8S4bdmASIKXaKprJ2t9eijSvAYSmwfhh3eQa8MFlA0N/IYB2AwWouaEIvMrF84ky6pLj 2AWLTTJIm/bt3DDdeezDUpdilAcSeRDzFpkt9I52KB5dupPShP1lswTyhM4Msu5zNGol 2hiGHHqwRx97ihDoc7zh9kbSPUg+hoDkVHrtVMOtzG7p73O+fcpbyN5jez7Ujfas1V44 S8zA== 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:mime-version :content-transfer-encoding; bh=Au7ZI6tVrnQwbn5Ke3jBgvWAFwULvZLTprf4B9KL0Kw=; b=AEm5RuOh553WN+tdHjDNnpN7qnV4pz1EXZCDc+ev2oiskFVBV53ugjdP90IPBXPq7l PDaJ61Wg+Fyn0omFiiD1VevFA76gYx8VWLP2xlp0WaJ+fUInvVLEQFIgPq+rhbETa055 GUQT8736a7uacNp/OGIEDjrNCOtnSbJj5WJOOpWHjYSLK054H0nu2RPir+UF4R29nona o1JKTETK4j8d9RXL8O8y8yLNqPbrBb+snpFaQeqgNbrqx1Lr1TlNV3Za9IIZKWSU9R7K j4PT2oAXJQDUVuGwN147bT8FB03UzpXL+K+xlWh8RTIxpUpvug3i7W+6NBGfMPA0hbQo dxwg== X-Gm-Message-State: APjAAAVCqc/w4xkBOZBUC86ZyhpHEnXr4pmBCBYaWlMRggJnCHdEo/RE /X7oOWDncrkTi/wDDP6GkACn6ngF X-Google-Smtp-Source: APXvYqyz0VrPt4y0pPCz6dJWd0fS1j62pnby/k6Xkudi4/Dus+4l9x003JlSEtr4verkVJ1NDqAcMA== X-Received: by 2002:adf:ef8f:: with SMTP id d15mr19868875wro.67.1570407038274; Sun, 06 Oct 2019 17:10:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id x16sm11270349wrl.32.2019.10.06.17.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Oct 2019 17:10:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 02:10:30 +0200 Message-Id: <20191007001030.3856-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/filter: Remove extra '; ' outside of functions 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" They are not allowed outside of functions. Fixes the warning "ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]" when compiling with GCC and -pedantic. Signed-off-by: Andreas Rheinhardt --- libavcodec/v4l2_m2m_dec.c | 2 +- libavfilter/vf_blend.c | 10 +++++----- libavfilter/vf_vmafmotion.c | 4 ++-- libavfilter/x86/scene_sad_init.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 0c3fa3a7be..4712aca34c 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -256,7 +256,7 @@ static const AVOption options[] = { .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ .wrapper_name = "v4l2m2m", \ - }; + } M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb"); diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index d6036c10e2..67163be3e7 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -639,11 +639,11 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ } \ } -DEFINE_INIT_BLEND_FUNC(8, 8); -DEFINE_INIT_BLEND_FUNC(9, 16); -DEFINE_INIT_BLEND_FUNC(10, 16); -DEFINE_INIT_BLEND_FUNC(12, 16); -DEFINE_INIT_BLEND_FUNC(16, 16); +DEFINE_INIT_BLEND_FUNC(8, 8) +DEFINE_INIT_BLEND_FUNC(9, 16) +DEFINE_INIT_BLEND_FUNC(10, 16) +DEFINE_INIT_BLEND_FUNC(12, 16) +DEFINE_INIT_BLEND_FUNC(16, 16) void ff_blend_init(FilterParams *param, int depth) { diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 5c2a974538..88d0b35095 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -176,8 +176,8 @@ static void convolution_y_##bits##bit(const uint16_t *filter, int filt_w, \ } \ } -conv_y_fn(uint8_t, 8); -conv_y_fn(uint16_t, 10); +conv_y_fn(uint8_t, 8) +conv_y_fn(uint16_t, 10) static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) { dsp->convolution_x = convolution_x; diff --git a/libavfilter/x86/scene_sad_init.c b/libavfilter/x86/scene_sad_init.c index f8104dcb4f..2c3729ceee 100644 --- a/libavfilter/x86/scene_sad_init.c +++ b/libavfilter/x86/scene_sad_init.c @@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \ } #if HAVE_X86ASM -SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16); +SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16) #if HAVE_AVX2_EXTERNAL -SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32); +SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32) #endif #endif