From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sat, 9 Nov 2024 12:35:06 +0000 (+0100)
Subject: demux: mkv: use the internal USF FourCC value
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d237ad565e8654c81d8126d140b957c244ba932c;p=vlc.git

demux: mkv: use the internal USF FourCC value

Rather than a local FourCC.

(cherry picked from commit 447116d324f8493120ce84544aed0cfc290aafb2)

Gbp-Pq: Name 0098-demux-mkv-use-the-internal-USF-FourCC-value.patch
---

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index b9a2d279..7a5f5fb6 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -2066,7 +2066,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
         }
         S_CASE("S_TEXT/USF") {
             ONLY_FMT(SPU);
-            vars.p_tk->fmt.i_codec = VLC_FOURCC( 'u', 's', 'f', ' ' );
+            vars.p_tk->fmt.i_codec = VLC_CODEC_USF;
             vars.p_tk->fmt.subs.psz_encoding = strdup( "UTF-8" );
             fill_extra_data( vars.p_tk, 0 );
         }