[vlc-commits] demux: mp4: fix regression with disabled tracks

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 12 20:19:11 2018 +0200| [707d4a657ef24a7f66cce53bb128a63d27cfbdc1] | committer: Francois Cartegnie

demux: mp4: fix regression with disabled tracks

(cherry picked from commit 7f2269f3017c163404e83a0b20be0e749daeea48)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=707d4a657ef24a7f66cce53bb128a63d27cfbdc1
---

 modules/demux/mp4/mp4.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index e2bfb8467b..a85a5d3d2b 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3219,8 +3219,6 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
     /* do we launch this track by default ? */
     p_track->b_enable =
         ( ( BOXDATA(p_tkhd)->i_flags&MP4_TRACK_ENABLED ) != 0 );
-    if( !p_track->b_enable )
-        p_track->fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
 
     p_track->i_track_ID = BOXDATA(p_tkhd)->i_track_ID;
 
@@ -3459,6 +3457,9 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
         p_track->fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
     }
 
+    if( !p_track->b_enable )
+        p_track->fmt.i_priority = ES_PRIORITY_NOT_DEFAULTABLE;
+
     if( TrackCreateES( p_demux,
                        p_track, p_track->i_chunk,
                       (p_track->b_chapters_source || !b_create_es) ? NULL : &p_track->p_es ) )