demux: mkv: don't use the segment UID if it's NULL

(cherry picked from commit 920b3937dc554bf1b2efef125fb1aff9d2c61245) Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
videolan · May 29, 2018 · d2dadb3 · d2dadb3
1 parent 1d2d23e
commit d2dadb3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
@@ -509,9 +509,8 @@ bool demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, matroska_stream_c *
 
             p_segment1->Preload();
 
-            b_keep_segment = (FindSegment( *p_segment1->p_segment_uid ) == NULL);
-
-            if ( b_keep_segment || !p_segment1->p_segment_uid )
+            if ( !p_segment1->p_segment_uid ||
+                 (b_keep_segment = (FindSegment( *p_segment1->p_segment_uid ) == NULL)))
             {
                 opened_segments.push_back( p_segment1 );
                 b_keep_stream = true;