[vlc-devel] commit: Correctly setup the clock state when creating a new program. ( Laurent Aimar )

git version control git at videolan.org
Tue Jun 2 23:30:25 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Tue Jun  2 23:03:44 2009 +0200| [0b49ff4af55f474b00d05bf1ce6d47d5bbe70390] | committer: Laurent Aimar 

Correctly setup the clock state when creating a new program.

It avoid an assert if a program was created after the input was paused.
(cherry picked from commit 600446bee8c612148e23c2915cd80f8c8dc2cfeb)

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

 src/input/es_out.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 22d4026..040365d 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1029,9 +1029,10 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
         free( p_pgrm );
         return NULL;
     }
+    if( p_sys->b_paused )
+        input_clock_ChangePause( p_pgrm->p_clock, p_sys->b_paused, p_sys->i_pause_date );
     input_clock_SetJitter( p_pgrm->p_clock, p_sys->i_pts_delay, p_sys->i_cr_average );
 
-
     /* Append it */
     TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
 




More information about the vlc-devel mailing list