]> git.sesse.net Git - vlc/commitdiff
demux: mp4: text/tx3g defaults to codec tx3G (fix #14045)
authorFrancois Cartegnie <fcvlcdev@free.fr>
Mon, 2 Mar 2015 15:33:57 +0000 (16:33 +0100)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Mon, 2 Mar 2015 15:35:31 +0000 (16:35 +0100)
modules/demux/mp4/mp4.c

index e22102440df8a12366124e88214aa1a514f73d4c..f5774541e6ff8929cd73e01eaeaf70c988a261ba 100644 (file)
@@ -1813,7 +1813,7 @@ static void LoadChapter( demux_t  *p_demux )
             {
                 mp4_track_t *tk = &p_sys->track[j];
                 if( tk->b_ok && tk->i_track_ID == p_chap->i_track_ID[i] &&
-                    tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == VLC_CODEC_SUBT )
+                    tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == VLC_CODEC_TX3G )
                     break;
             }
             if( j < p_sys->i_tracks )
@@ -2701,7 +2701,6 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
         case( ATOM_text ):
         case( ATOM_subp ):
         case( ATOM_sbtl ):
-            p_track->fmt.i_codec = VLC_CODEC_TX3G;
             p_track->fmt.i_cat = SPU_ES;
             break;