vlc | branch: master | Filip Roséen <[email protected]> | Fri May 13 15:34:42 2016 +0200| [258416328388c5dfd50efc022843ce81d28595ea] | committer: Thomas Guillem
mkv: fix crash when seek includes tracks without ES out Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=258416328388c5dfd50efc022843ce81d28595ea --- modules/demux/mkv/matroska_segment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp index 85a9c55..ac5af66 100644 --- a/modules/demux/mkv/matroska_segment.cpp +++ b/modules/demux/mkv/matroska_segment.cpp @@ -823,9 +823,9 @@ void matroska_segment_c::Seek( mtime_t i_absolute_mk_date, mtime_t i_mk_time_off track.i_last_dts = it->second.pts; - bool is_active; + bool is_active = false; - if( es_out_Control( sys.demuxer.out, ES_OUT_GET_ES_STATE, track.p_es, &is_active ) ) + if( track.p_es && es_out_Control( sys.demuxer.out, ES_OUT_GET_ES_STATE, track.p_es, &is_active ) ) { msg_Err( &sys.demuxer, "Unable to query track %u for ES_OUT_GET_ES_STATE", it->first ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
