diff options
| author | wm4 <wm4@nowhere> | 2015-01-16 12:03:04 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:09 +0900 |
| commit | b0877e54541427402ec6d748bcc67011361c9be6 (patch) | |
| tree | 16da2f027e653371a0180296ce19fcaf796d8424 | |
| parent | c926927c594ce05e8a6be5b80d44e320c820bf84 (diff) | |
| download | mpv-b0877e54541427402ec6d748bcc67011361c9be6.tar.bz2 mpv-b0877e54541427402ec6d748bcc67011361c9be6.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/video.c b/player/video.c index ac63ec47f2..50fa8d7a3d 100644 --- a/player/video.c +++ b/player/video.c @@ -756,7 +756,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; |