]> git.sesse.net Git - vlc/commitdiff
EsOutDecodersStopBuffering: remove assert
authorRafaël Carré <funman@videolan.org>
Fri, 22 Aug 2014 09:55:29 +0000 (11:55 +0200)
committerRafaël Carré <funman@videolan.org>
Fri, 22 Aug 2014 09:55:29 +0000 (11:55 +0200)
The master program clock does not necessarily have a reference
A different program PCR can be issued first, and the assertion
would be triggered since c3bd897e586d906d631a1cdc51232f76ff1ca1fe

src/input/es_out.c

index f042fa635ebe26cf99c6f3edb4d96bd12fd801dd..dafaaecff10ac6e2bd1b27606169f84dd690172c 100644 (file)
@@ -603,11 +603,9 @@ static void EsOutDecodersStopBuffering( es_out_t *out, bool b_forced )
     mtime_t i_system_start;
     mtime_t i_stream_duration;
     mtime_t i_system_duration;
-    i_ret = input_clock_GetState( p_sys->p_pgrm->p_clock,
+    if (input_clock_GetState( p_sys->p_pgrm->p_clock,
                                   &i_stream_start, &i_system_start,
-                                  &i_stream_duration, &i_system_duration );
-    assert( !i_ret || b_forced );
-    if( i_ret )
+                                  &i_stream_duration, &i_system_duration ))
         return;
 
     mtime_t i_preroll_duration = 0;