[vlc-devel] commit: Fixed an assert with still frame in dvdnav. (Laurent Aimar )

git version control git at videolan.org
Sun Feb 21 23:34:07 CET 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Feb 21 23:27:00 2010 +0100| [24ae7ed55e206a37571d0d39a3d21353936f9a64] | committer: Laurent Aimar 

Fixed an assert with still frame in dvdnav.

We can come out of still mode by user actions, and so
the timer need to be reset in DVDNAV_BLOCK_OK.

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

 modules/access/dvdnav.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index c4bb1c6..b02ee9f 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -605,6 +605,7 @@ static int Demux( demux_t *p_demux )
     {
     case DVDNAV_BLOCK_OK:   /* mpeg block */
         vlc_mutex_lock( &p_sys->still.lock );
+        vlc_timer_schedule( p_sys->still.timer, false, 0, 0 );
         p_sys->still.b_enabled = false;
         vlc_mutex_unlock( &p_sys->still.lock );
         if( p_sys->b_reset_pcr )




More information about the vlc-devel mailing list