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

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Feb 21 23:27:00 2010 +0100| [ed4b6fbfc2d797bb7450758fe82e1f6c02fa9893] | committer: Rémi Denis-Courmont 

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.
(cherry picked from commit 24ae7ed55e206a37571d0d39a3d21353936f9a64)

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

 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 b38852c..e704904 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -644,6 +644,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 )