[vlc-commits] EsOutDecodersStopBuffering: remove assert

Rafaël Carré git at videolan.org
Tue Aug 26 00:24:43 CEST 2014


vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Aug 22 11:55:29 2014 +0200| [16bc6fb199487fd052270511cceaa1652ad40d2f] | committer: Jean-Baptiste Kempf

EsOutDecodersStopBuffering: remove assert

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

(cherry picked from commit 8bb2d53a5a98770ab29baeb4581a5d90cafd3411)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=16bc6fb199487fd052270511cceaa1652ad40d2f
---

 src/input/es_out.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index d5ac33b..ab09254 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -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;



More information about the vlc-commits mailing list