From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id BCBA54C609 for ; Mon, 4 Aug 2025 06:32:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8AF1B68BFBD; Mon, 4 Aug 2025 09:32:48 +0300 (EEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 78EDD68BCA6 for ; Mon, 4 Aug 2025 09:32:41 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2403df11a2aso24720015ad.0 for ; Sun, 03 Aug 2025 23:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754289159; x=1754893959; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=D4ypxHWJjk87Tq0CXJXrpXtl1/07W0C4Pqoi91FypNY=; b=CUt9DYSrpkrkjKdTMLXUH5a0MmSw3JrTVa528TFZMYBLYAx0c3KI62zEfxyDfk5/W/ h4/xe/2cROXt5Z+Xg9maEbOWJHaPnMNrbWdtrCc+h5qLwg0JW6XuD4GiwOGXlMygt6AO 67iy1luKGLnoRirdr0n1gNGWWAB7bGnGMA6CKxjL1oF5RGTYsjBgiHcxVjSu/ydVwWSQ 4i424OMDYd8h3h0Aji0hiQ47d3atsc2/TOUtDXW+90haMe3CwFHTMio+2yw5AzS5dN3B U5GhEsnksJkQRxuxmZnyPU8HrU7T+ojRCpXpqBhdjGlGUeCl8BDhkM3bSIUlGUiLBuzw MKPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754289159; x=1754893959; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D4ypxHWJjk87Tq0CXJXrpXtl1/07W0C4Pqoi91FypNY=; b=iAuwyPh8XwzvZ5pWMaEAMDep6kH946/CPDmpe/bNjsxGIQcWDE4meP7vIc2+I7SQwn v3pL2H/HHZMOx4TXrzYTcj9Zo1Wg+6WYm85oql9lNa7N+YIzU82PDLXNfD8Rw53HYW5j OVD11BWGzkPw04jIOi1iA+HjzeeArzGZQEVzeJ1KaeF5TAxLtrRBeMB+D7sbbH8XWk/4 O6x4KZbp4j0vFR5AQJ2ORMa2vuZ8BFkHvsPCUIvCzyJ9pyhCoKzFhAdAuHYixF347Ncp aiNxciCsbiev4C8JF6UaOJYmv2TVf2KQqk/BkpeEvVm0sC8jc/B8xSYi3xrunVrAR6LD K5ew== X-Gm-Message-State: AOJu0YzQco4z5fToTiNTfSXUXvZ4ahIuyN2VCdCfPOs7ucjQQZ0W/xqw xdrsIEyFJyDHIB4dI6HYx9f1EfRDKcxSf6p1XjoPeLT5i0twbq9UTlWs8MZF X-Gm-Gg: ASbGnct6g//Z89sSZnN50Wl2DCs2To3JAdGKt//XnwmdJ0JiJnug1FMuNnHe+0mrrPF ECH2eO7jIt7XcaODdKdqCEuMwfdciy+O/0sOH+2z8j8ehelmAhil1NDWlMJwzxhNbVk4/sFsSX7 KCzTPaT/M8XjmJC0qMsdPvU5A4fqyqRBKwPPe1mmLyUUGI4bjSMVSJ70+HWSzbMMu9XiwQLX5iO K2CpI1JoWaqP+Sl9EKzuqGVLFnPqDCQCFc9C/ow4IK7KsYu4+08VoxHT3bcu/U+VhVF7FPW3Er7 gUJFbIolmnlK60nqDL6qn6iMJuxD48c+DxiHixBiDUQSvWG6SeY6j/+JFL4rW4NVn1sHUf6Ayaq LPLkVEWKwk24L8+TsS5lrmiuqyfBVT4YiSac5kfoy1cx71d1zspziX0aImCewmg== X-Google-Smtp-Source: AGHT+IH8LLlHxAIG1aCp9hm1vcF6Xs202Sqf4cHnNot3ip7mLVr2pMu9ZuskaWMDcZIh2ptQ+K1dfw== X-Received: by 2002:a17:903:234c:b0:240:8fa2:15d2 with SMTP id d9443c01a7336-24246ffbc97mr102304055ad.33.1754289158849; Sun, 03 Aug 2025 23:32:38 -0700 (PDT) Received: from JH-WORKSTATION.localdomain ([220.123.92.122]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8aa8e0esm102022965ad.151.2025.08.03.23.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Aug 2025 23:32:38 -0700 (PDT) From: devjeonghwan To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Aug 2025 15:30:47 +0900 Message-Id: <20250804063047.10458-1-dev.parkjeonghwan@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Signed-off-by: devjeonghwan 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: devjeonghwan Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: avformat/apngdec: allow other chunks between fcTL and fdAT/IDAT The APNG demuxer incorrectly assumed that fcTL chunks must be immediately followed by fdAT or IDAT chunks. Per PNG specification section 14.3.2, ancillary chunks may appear in any order relative to other ancillary chunks. This change allows intermediate chunks (like tEXt) between fcTL and frame data chunks, fixing playback of APNG files with metadata. Fixes #11012. --- libavformat/apngdec.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index d0005046c1..a21878b246 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -344,14 +344,27 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) if ((ret = decode_fctl_chunk(s, ctx, pkt)) < 0) return ret; - /* fcTL must precede fdAT or IDAT */ + /* fcTL may be followed by other chunks before fdAT or IDAT */ len = avio_rb32(pb); tag = avio_rl32(pb); - if (len > 0x7fffffff || - tag != MKTAG('f', 'd', 'A', 'T') && - tag != MKTAG('I', 'D', 'A', 'T')) + if (len > 0x7fffffff) return AVERROR_INVALIDDATA; + /* check for empty frame */ + if (tag == MKTAG('f', 'c', 'T', 'L') || + tag == MKTAG('I', 'E', 'N', 'D')) { + size = 38; /* size of fcTL chunk and its header */ + if ((ret = avio_seek(pb, -46, SEEK_CUR)) < 0 || + (ret = av_append_packet(pb, pkt, size)) < 0) + return ret; + + if (ctx->is_key_frame) + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->pts = pkt->dts = AV_NOPTS_VALUE; + pkt->duration = ctx->pkt_duration; + return ret; + } + size = 38 /* fcTL */ + 8 /* len, tag */ + len + 4 /* crc */; if (size > INT_MAX) return AVERROR(EINVAL); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".