summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-16 12:03:04 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:19 +0900
commitad9ea546d3b913b7b691c6fe0cb0fee6492d9d9b (patch)
treed0e657786aaa657a31c5a4683a16f8b253a2d71b
parentc63d9292616838c4a7490253f6f4c95dd2fe1aec (diff)
downloadmpv-ad9ea546d3b913b7b691c6fe0cb0fee6492d9d9b.tar.bz2
mpv-ad9ea546d3b913b7b691c6fe0cb0fee6492d9d9b.tar.xz
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.
-rw-r--r--player/video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/video.c b/player/video.c
index fd8df9cead..4b216af049 100644
--- a/player/video.c
+++ b/player/video.c
@@ -771,7 +771,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;