From patchwork Sun Apr 16 16:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1838763pzb; Sun, 16 Apr 2023 09:48:59 -0700 (PDT) X-Google-Smtp-Source: AKy350az+fb7tOs81BCqWb/Snc7ahCTXa0mIXsgkadHXkfLIk6++AzzyB7BMNOo1OemcokgSoofo X-Received: by 2002:a17:907:210e:b0:879:ab3:93cd with SMTP id qn14-20020a170907210e00b008790ab393cdmr4303917ejb.46.1681663739355; Sun, 16 Apr 2023 09:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681663739; cv=none; d=google.com; s=arc-20160816; b=lBRLD5zhGoXMbsfgPbpZ8qeqLX3Lq/pdT7yKruHM5iO2+PNwYRveUzG/MhCs+LyzN2 BTnCkf8aLXn/f+W0A7fvoTccno/d3pQCebs5LJMdSe+ind00IOiUKs1ypV5Gsq/xXL8B O9koX6Zgt3HVvHK4IHJD0E+ZlXDOcUvLX97CEDdgIg3HXBIAdRG9qG4GM5Ujh63XKsbh uFjhMRGLJrhFFtUf0xN24JuRSNwrXkt2lWeijtlU//ouPowX7g0ancGc8s0ZweAIjIJ0 +8aSGwQN745bVKo8eVt5AYWUv7a1XvsqiWLGYO1/cDIw3CSbPgV5+dBc0g1n/ZNiz3Ad nP8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=S6n1lT4Ut7jQ+ThY3xf1LTY0eOVuxDN43o4AzHA6ZyU=; b=NQZR/5YAeE3FGwnd5OklPTefCpTZrIeA6cwijlQKkEBuMQz4OSqAi4YC2zFE61nwaR gR1lwqrDfUImabrKAJ8vtf7cwrDV3q8s1LaN5uojJLiS7+82+W2UPciu76+Ecqt3HN+j CqP/PFof8M/FtAakpyANVNZ4VKnMENnD/mPWCREI3TH9yk5mPSlMruFTQkdABT5RQW3V jtmyTuVceKepbKZjBbgltFOcyYu1NcCzX+jVcGPaYe5KNxN07/3vruCRuCj9I2pcKie3 DoVqaHltnK6eQ4UNh9+KR0m6gc5qshCw99AcyahLCZFI3FCss2ev5hYk1DKHIZRddZYR 2X3A== 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 mz15-20020a1709071b8f00b0094f4f2ba2acsi1418706ejc.593.2023.04.16.09.48.59; Sun, 16 Apr 2023 09:48:59 -0700 (PDT) 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 097C668BCAC; Sun, 16 Apr 2023 19:48:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA47C68B9AB for ; Sun, 16 Apr 2023 19:48:35 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id F12F51BF208 for ; Sun, 16 Apr 2023 16:48:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 Apr 2023 18:48:21 +0200 Message-Id: <20230416164830.15664-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416164830.15664-1-michael@niedermayer.cc> References: <20230416164830.15664-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/pngdec: remove AVFrame argument from decode_iccp_chunk() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5BrW/rdCoIea Signed-off-by: Michael Niedermayer --- libavcodec/pngdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 8fbb71f60f6..679cb8c2281 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -972,7 +972,7 @@ static int decode_trns_chunk(AVCodecContext *avctx, PNGDecContext *s, return 0; } -static int decode_iccp_chunk(PNGDecContext *s, GetByteContext *gb, AVFrame *f) +static int decode_iccp_chunk(PNGDecContext *s, GetByteContext *gb) { int ret, cnt = 0; AVBPrint bp; @@ -1466,7 +1466,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, s->have_srgb = 1; break; case MKTAG('i', 'C', 'C', 'P'): { - if ((ret = decode_iccp_chunk(s, &gb_chunk, p)) < 0) + if ((ret = decode_iccp_chunk(s, &gb_chunk)) < 0) goto fail; break; }