From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 781B34C06C for ; Thu, 1 May 2025 17:50:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2D62687DC8; Thu, 1 May 2025 20:50:12 +0300 (EEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF3FE687D57 for ; Thu, 1 May 2025 20:50:05 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-227d6b530d8so13861915ad.3 for ; Thu, 01 May 2025 10:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746121804; x=1746726604; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ZGV8cA9CTriz+PnCzezwoNgvRynwatJw6cKbvKsg99M=; b=SB8nLKD2n6fKTa9hchhYNxneVVLznowCi4yXFDdtkCxwcfy6NWZWL0FHo1AQMdixCN YzABJBZRo6gvKz4iipL03MkviququkDDHNHZ656oVQ9jVNBgpJbSHdiIr7Mi06vDZMF6 eCGdy89Axxb1IKj36Hsq3rtjLcTii4mnDKDs4SLi3Ihmwk5H+3xjWn1j7cYSXXHAZfks 4USfisRHYx7qzYC7CjfgYgUlSEHF7sO3hDgTweoYR+W+ARyeG+BsH0EkyXP922Gn31kH FR+eADgtNBAqqn6es7vhBWYjRZUt50HhnjwfuVCbVe5Y3N/MmGcsdwXrNP5klI71/MFP tiBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746121804; x=1746726604; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZGV8cA9CTriz+PnCzezwoNgvRynwatJw6cKbvKsg99M=; b=UH63AzwHStAedjp4bG/GzJFAY1Ae+JJNQO/swIiCUlRtDjozjFo6tLnVW4DJEBoT+P xRqejjowDGXh9M7dVDzeXRPBregOIdQX6Jh6g4I6v04O6P/LI/G1OMEj4QUpbtbwx5ll fbIl8lAbVujXjdFFwD5xU3TQdJfpBY1o49SGkvJGxzJDvOTSLUb3k8lRpk3tcbnuiaO6 j/3Mp2hjDI21LyBErjyf2tz/tpfi96T6gIrp7wzq130trM+L7Yt0V7I41yzcxdtd3FNS 3pjVyyGUHblfHxgQvoFmmgou7IFDZjCwaHAo2MXpDq0bBkHr88D4aw5P6hRL9b/tcZCu jkaQ== X-Gm-Message-State: AOJu0YzMzCEdbQrlh2yr6JdomgjnXSC9+s3/vXVWd6Xadn2HXD/50eBV EBXLXZEHdYiLyLnpyqN3Wsom/cLA73TgDhYtAZ/bNiNeslR2z2lb/e3WQQ== X-Gm-Gg: ASbGnctV9thseV8u4BQ+jrWCwYYIxWJmt799H/l2SjmCCPtUrTALqXpMgnWsly1ozfK xE6BZrmF0VBeeLZKph8d5kzty0IuX3fs9WYmda8tbniSKULXVuux0BwWbaQAn1OykQauSZ8ZKcr zz67MHO53tPawcUEkdr5FA6W3jd+XEgDoSb9hIQ/2Mu16XUD+semeC9kqIFLsRF+2R1uc+YmxJ7 j5PnDRYy/JZC6NibEpKQYa22y8L1Avs9oNoXggkJ/0yBJpah7q2dXQj52AlvZvCLX8K8eA/+p1l 3QcipD4VnV5NIfK7roCEuhYCXnC6lD3WvFoATJvIYnzpc3DKDn23nNVM+g== X-Google-Smtp-Source: AGHT+IHIF/x1ZjUyidU8DaZAC996kFmShvikogjtMVjlvdi1uym17D0E3VtNgxMavEqBuh3BMPDXHg== X-Received: by 2002:a17:903:1b28:b0:223:517c:bfa1 with SMTP id d9443c01a7336-22e0863aec7mr54942575ad.38.1746121803622; Thu, 01 May 2025 10:50:03 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:158:550d:a133:719f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e0bb068a6sm9697405ad.15.2025.05.01.10.50.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 10:50:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 May 2025 14:49:48 -0300 Message-ID: <20250501174948.2953-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/apvdec: also look for an au_info PBU during probing 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 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: If present, an Access unit information PBU must be the first in an AU. Signed-off-by: James Almer --- libavformat/apvdec.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index 5d0b11b654..e53c9ed085 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -51,7 +51,24 @@ static int apv_extract_header_info(GetByteContext *gbc) if (zero != 0) return AVERROR_INVALIDDATA; - if (info->pbu_type != APV_PBU_PRIMARY_FRAME) + if (info->pbu_type == APV_PBU_ACCESS_UNIT_INFORMATION) { + unsigned int num_frames = bytestream2_get_be16(gbc); + int pbu_type; + + if (num_frames < 1) + return AVERROR_INVALIDDATA; + + info->pbu_type = bytestream2_get_byte(gbc); + if (info->pbu_type != APV_PBU_PRIMARY_FRAME && + info->pbu_type != APV_PBU_NON_PRIMARY_FRAME && + (info->pbu_type < APV_PBU_PREVIEW_FRAME || info->pbu_type > APV_PBU_ALPHA_FRAME)) + return AVERROR_INVALIDDATA; + + bytestream2_skip(gbc, 2); // group_id + zero = bytestream2_get_byte(gbc); + if (zero != 0) + return AVERROR_INVALIDDATA; + } else if (info->pbu_type != APV_PBU_PRIMARY_FRAME) return AVERROR_INVALIDDATA; info->profile_idc = bytestream2_get_byte(gbc); -- 2.49.0 _______________________________________________ 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".