Prefer new frames over flushed one (vout).

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index c282ee0ad43ca95684a0b335f4feb97f20980877..a646ef14a11a714c6eaa8d99d213a8adedbd3f94 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -908,7 +908,30 @@ static void* RunThread( vlc_object_t *p_this )
             }
         }
         if( p_vout->p->b_paused && p_last_picture != NULL )
-            p_picture = p_last_picture;
+        {
+            p_picture = NULL;
+            if( p_last_picture->date == 1 )
+            {
+                for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
+                {
+                    picture_t *p_pic = PP_RENDERPICTURE[i_index];
+
+                    if( p_pic->i_status != READY_PICTURE )
+                        continue;
+                    if( p_pic->date <= p_last_picture->date && p_pic != p_last_picture )
+                    {
+                        DropPicture( p_vout, p_pic );
+                    }
+                    else if( p_pic->date > p_last_picture->date && ( p_picture == NULL || p_pic->date < display_date ) )
+                    {
+                        p_picture = p_pic;
+                        display_date = p_picture->date;
+                    }
+                }
+            }
+            if( !p_picture )
+                p_picture = p_last_picture;
+        }
 
         if( p_picture )
         {