From patchwork Mon Feb 13 21:36:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3807810pzk; Mon, 13 Feb 2023 13:37:02 -0800 (PST) X-Google-Smtp-Source: AK7set9yaEtOTyUNUIljVqTnJGwYqIqnTnEP9LhFB2G1k+r8MCsPwK1vYcyIFRgE2RhUSxv7igoI X-Received: by 2002:a17:906:c213:b0:8b1:d5c:986e with SMTP id d19-20020a170906c21300b008b10d5c986emr385918ejz.15.1676324221803; Mon, 13 Feb 2023 13:37:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676324221; cv=none; d=google.com; s=arc-20160816; b=XFL+bEUswbk8TAX783yNvRKbx93h5LC/VVn6KmA8MGh0e/QUeQL8daNB9AppC8+bdf YNQSRiaG9WCvScbboYudJR/1j/tHBe+p2rJ7LWvr3Ld+KBi/KGg6opBITc+/7J/b531D HoryF4JCEkUtQkpUVSJmvTU0a1BNXLmcE7djo4ujsq+Jir4eWfOOp9epKanLmI8AzBSd T2cZy3hY5nO6MtGcS9AqR9vCxCWmxovS9c/HfCGTo6fMZlcZZYpEIqlWaLVmEq8Qu38u 2MG4sB0ZG+MBDYcsdlKx1WarH1bb6Bzhs0Q06/ZyAr7e/XnXMZdwOgBWVOLAvoz/IpTZ Efeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=AmszPuSBXXH5r9jrB7RENpWbkja4v/GVTHeumvIqD40=; b=t+fVUKs2tUVP3gYCHowNeFtW98sQTP4AJ7gJyTUPJEuT+GeoFmNQYRCigm+SwjcGmj yUlfVR+mrcrmx5+BBE1HO0qy2+hsjVMBMNC5An+ahCNSBNb1yfLhXdCcIWweCDbGemZC esvaFHSbPc/M2yAkClBprMOhSpd8COqpNiMTzLGhoROVIzjyf9ncSGMKbKrQV5u5+gCD nESnkk41Zti4VhPwMF6yEbXY51YLR5v9jMBAvVgsO43+PATiGlA5MZ/AVSbYnrIr7LFA rOmWPdHANXdrSRdjcWnGNyQQZ0ADy7YPKmHpLHdpOzLyErhHi5mZCEQuYVHv+UiOX8gR H8Jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fp31-20020a1709069e1f00b008af8b86ee0asi7454828ejc.976.2023.02.13.13.37.01; Mon, 13 Feb 2023 13:37:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E06F468BE7E; Mon, 13 Feb 2023 23:36:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0590268BDEA for ; Mon, 13 Feb 2023 23:36:52 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 354D5E8703; Mon, 13 Feb 2023 22:36:50 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qg7MysmFb765; Mon, 13 Feb 2023 22:36:48 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E28A9E859E; Mon, 13 Feb 2023 22:36:47 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Feb 2023 22:36:23 +0100 Message-Id: <20230213213623.14910-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: fix else clause when zeroing reordered_opaque X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yt43L7cUrd7t CC libavcodec/libx265.o libavcodec/libx265.c: In function ‘libx265_encode_frame’: libavcodec/libx265.c:781:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] else ^~~~ libavcodec/libx265.c:782:1: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ FF_DISABLE_DEPRECATION_WARNINGS ^~~ Signed-off-by: Marton Balint --- libavcodec/libx265.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 6a2600c5e7..420d0953af 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -778,10 +778,11 @@ FF_ENABLE_DEPRECATION_WARNINGS rd_release(ctx, idx); } #if FF_API_REORDERED_OPAQUE - else + else { FF_DISABLE_DEPRECATION_WARNINGS avctx->reordered_opaque = 0; FF_ENABLE_DEPRECATION_WARNINGS + } #endif *got_packet = 1;