summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-09 00:01:12 +0200
committerwm4 <wm4@nowhere>2014-06-09 01:21:08 +0200
commite1d846263ae65bc22b82b4011bcaaaa57645357d (patch)
treed868d76c08f99c9f6828a3b6554f889d358b51ab
parentadea4386bceca56ce690ed94dcb22b6ed7bc3288 (diff)
downloadmpv-e1d846263ae65bc22b82b4011bcaaaa57645357d.tar.bz2
mpv-e1d846263ae65bc22b82b4011bcaaaa57645357d.tar.xz
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.
-rw-r--r--video/out/vo.c2
1 files changed, 1 insertions, 1 deletions
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)