From e1d846263ae65bc22b82b4011bcaaaa57645357d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 Jun 2014 00:01:12 +0200
Subject: video: fix another cover art corner case

Playing a video and then an audio file with cover art kept displaying
the last frame of the video. This was because the hasframe flag was set,
perhaps due to redrawing the last video frame before the cover art image
is decoded.
---
 video/out/vo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/video/out/vo.c b/video/out/vo.c
index 4595fa0d8a..60ee2ac8bd 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -351,6 +351,7 @@ void vo_new_frame_imminent(struct vo *vo)
     assert(vo->num_video_queue > 0);
     vo->driver->draw_image(vo, vo->video_queue[0]);
     shift_queue(vo);
+    vo->hasframe = true;
 }
 
 void vo_draw_osd(struct vo *vo, struct osd_state *osd)
@@ -368,7 +369,6 @@ void vo_flip_page(struct vo *vo, int64_t pts_us, int duration)
         vo->driver->flip_page_timed(vo, pts_us, duration);
     else
         vo->driver->flip_page(vo);
-    vo->hasframe = true;
 }
 
 void vo_check_events(struct vo *vo)
-- 
cgit v1.2.3