[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: demux: mkv: use the internal USF FourCC value

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
bf98c556 by Steve Lhomme at 2024-11-15T08:10:16+00:00
demux: mkv: use the internal USF FourCC value

Rather than a local FourCC.

(cherry picked from commit 447116d324f8493120ce84544aed0cfc290aafb2)

- - - - -
77a2c01e by Steve Lhomme at 2024-11-15T08:10:16+00:00
demux: mkv: use the internal QDMC FourCC value

Rather than a local FourCC.

(cherry picked from commit 71c2622ab992a4bb4485e5e151f3019e60543d35)

- - - - -


1 changed file:

- modules/demux/mkv/matroska_segment_parse.cpp


Changes:

=====================================
modules/demux/mkv/matroska_segment_parse.cpp
=====================================
@@ -2034,7 +2034,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
         }
         S_CASE("A_QUICKTIME/QDMC") {
             vars.p_fmt->i_cat   = AUDIO_ES;
-            vars.p_fmt->i_codec = VLC_FOURCC('Q','D','M','C');
+            vars.p_fmt->i_codec = VLC_CODEC_QDMC;
 
             fill_extra_data( vars.p_tk, 0 );
         }
@@ -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 );
         }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/64e099576f908ad29205cd77a7dd1f0ea8053447...77a2c01e2dcb3474173904ce9fa761907cb10550

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/64e099576f908ad29205cd77a7dd1f0ea8053447...77a2c01e2dcb3474173904ce9fa761907cb10550
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance