From 73e5aa87d18e3fbadc286f94f89964acfada15b1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 16 Jan 2015 12:03:04 +0100 Subject: player: respect --untimed on video format changes If the video format changes (e.g. different frame size), a special code path is entered to wait until the currently displayed frame is done. Otherwise, the frame before the change would be destroyed by the vo_reconfig() call. This code path didn't respect --untimed; correct this. Fixes #1475. --- player/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/video.c') diff --git a/player/video.c b/player/video.c index 121f1a0bbe..23e3747219 100644 --- a/player/video.c +++ b/player/video.c @@ -786,7 +786,7 @@ void write_video(struct MPContext *mpctx, double endpts) struct mp_image_params p = mpctx->next_frame[0]->params; if (!vo->params || !mp_image_params_equal(&p, vo->params)) { // Changing config deletes the current frame; wait until it's finished. - if (vo_still_displaying(vo)) + if (vo_still_displaying(vo) && !(opts->untimed || vo->driver->untimed)) return; const struct vo_driver *info = mpctx->video_out->driver; -- cgit v1.2.3