From patchwork Mon Jun 1 11:32:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20052 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 376F9449674 for ; Mon, 1 Jun 2020 14:33:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B6FC689CDF; Mon, 1 Jun 2020 14:33:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 531C0687F99 for ; Mon, 1 Jun 2020 14:33:09 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id j10so11113460wrw.8 for ; Mon, 01 Jun 2020 04:33:09 -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=ja8DTp70EvKFH/NGK4gf2USvnYZWYQwuM+WckpkqczY=; b=oKs9+GBvSg/5E0KC/MJ1MvytJz2c5iYNWL/2cJmCHUlihHv/qAtzfT1fNdWIl3h4Mb nmn+/bOk2gWHEX5PALwQpvYmarEk+8x3EKkPVEfr2DgITv35yWc7j3vuuXhj1hehrZOO Pio2RLSmepEayxCQXasMmo03wKMjxsxFsBMZ+MkugGsRMVtKggiT0yjcBh4y4/QIKYxF pfuyjxgLejJBujP+ZbLkUug2oW279sgBCqzoboj6QC/kvYlpdbWgB52kQyvzLcv1CQOj gj8ep2oNlJRohMzbUJGcfdbfc8Z38eSXFNQOKZzEsm9eKP7VHIwMhICHMoZvxgsz8O0m cnRg== 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=ja8DTp70EvKFH/NGK4gf2USvnYZWYQwuM+WckpkqczY=; b=VogrL65y1cdu3EYGhF8Ci9bbXMWQYO862aFbKR6TkdQABurEWnJpPhNJVx00d7+To/ STVTnWHygO2W4YsIfLf2UWZgWVgyDXOWBwd7w0UIqHnk2uxZuJyhT/Oy31PnT4M5vV5T KnwVqYOM8yezU6wHWy6qBlajT+fX4oOIVUEwxwsGLB8ljIsHLq0vB1Z6AdmcxzfFmpVQ 2im+HRm5GTWKuUNwpuUxspQcL3gDDyoD42F3QySTcsvCCcVfPBJnmCkvQ8sVlcIu1gzR Qi6lNVWd75SdHKFN0SoKeQOHEzI3uhsVSl7x04prNIrOPeoYndVOwjzGaSe/clHZV2z+ WpgA== X-Gm-Message-State: AOAM530p4oufpv0aW6dqP601C5IaA6bzbskk9/NVMXcHbRafSpixAvbZ utkslMPszWdBWvEbVh6L1NGLv2It X-Google-Smtp-Source: ABdhPJygx1wF4LEhJGEArPSx5MC0LNlroUho5ZWPek7kydHjV9386SYoWKYPPM8H2yHjsWiEDqToog== X-Received: by 2002:a5d:61d0:: with SMTP id q16mr22487424wrv.182.1591011188488; Mon, 01 Jun 2020 04:33:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v19sm10278645wml.26.2020.06.01.04.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 04:33:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 13:32:36 +0200 Message-Id: <20200601113237.15114-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> References: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/v4l2_m2m_enc: Avoid ;; 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" Inside a function, the second ; in a double ;; is a null statement, but outside of functions a double ;; is simply invalid C that compilers happen to accept. v4l2_m2m_enc.c contained several ;; as a result of macro-expansion. So change the underlying macro so that it doesn't happen any longer. This fixes warnings when compiling with -pedantic: "ISO C does not allow extra ‘;’ outside of a function". Signed-off-by: Andreas Rheinhardt --- libavcodec/v4l2_m2m_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index a21a7b6c65..32321f392f 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -417,7 +417,7 @@ static const AVCodecDefault v4l2_m2m_defaults[] = { .defaults = v4l2_m2m_defaults, \ .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ .wrapper_name = "v4l2m2m", \ - }; + } M2MENC(mpeg4,"MPEG4", mpeg4_options, AV_CODEC_ID_MPEG4); M2MENC(h263, "H.263", options, AV_CODEC_ID_H263);