From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 29 Nov 2024 10:27:50 +0000 (+0100)
Subject: demux/mkv: force the packetizer to fill AV1 extradata without optional OBUs
X-Git-Tag: archive/raspbian/3.0.21-7+rpi1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da3766c5d429ba7197179dcff0ea3197a1be74a3;p=vlc.git

demux/mkv: force the packetizer to fill AV1 extradata without optional OBUs

The hardware decoders need it and the packetizer can fill it for us.

(cherry picked from commit f05f3388d32bfff5c20de710f79a87a914dcd166)

Gbp-Pq: Name 0109-demux-mkv-force-the-packetizer-to-fill-AV1-extradata.patch
---

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 15680314..428e7816 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1621,6 +1621,8 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
             vars.p_tk->b_pts_only = true;
 
             fill_extra_data( vars.p_tk, 0 );
+            if (vars.p_fmt->i_extra <= 4)
+                vars.p_fmt->b_packetized = false; // force full extradata by the packetizer
         }
         S_CASE("V_MPEG4/MS/V3") {
             vars.p_fmt->i_codec = VLC_CODEC_DIV3;