[vlc-commits] demux:mkv: don't check if a track is selected if it has no ES

Steve Lhomme git at videolan.org
Fri Jun 29 16:07:58 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jun 29 16:07:30 2018 +0200| [01737e895f5f83eadcab6e32996324f2cc482561] | committer: Steve Lhomme

demux:mkv: don't check if a track is selected if it has no ES

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01737e895f5f83eadcab6e32996324f2cc482561
---

 modules/demux/mkv/matroska_segment.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 148e66ee8f..0a7a588037 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -801,7 +801,10 @@ bool matroska_segment_c::Seek( demux_t &demuxer, vlc_tick_t i_absolute_mk_date,
         track.i_last_dts        = VLC_TS_INVALID;
 
         bool selected;
-        es_out_Control( demuxer.out, ES_OUT_GET_ES_STATE, track.p_es, &selected );
+        if (track.p_es == NULL)
+            selected = false;
+        else
+            es_out_Control( demuxer.out, ES_OUT_GET_ES_STATE, track.p_es, &selected );
         if ( selected )
             selected_tracks.push_back( track.i_number );
     }



More information about the vlc-commits mailing list