From 24ae7ed55e206a37571d0d39a3d21353936f9a64 Mon Sep 17 00:00:00 2001
From: Laurent Aimar <fenrir@videolan.org>
Date: Sun, 21 Feb 2010 23:27:00 +0100
Subject: [PATCH] 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.
---
 modules/access/dvdnav.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index c4bb1c61db..b02ee9faed 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 )
-- 
2.11.4.GIT