summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-16 13:45:43 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:20 +0900
commit126b7c47392159f835f471b35971d63b39da05a7 (patch)
tree8f92d94a6b9b46c3078646021b8a14032174f27d
parentf8b842cdf3af33ee4e971b41e077cf98ee081d34 (diff)
downloadmpv-126b7c47392159f835f471b35971d63b39da05a7.tar.bz2
mpv-126b7c47392159f835f471b35971d63b39da05a7.tar.xz
player: respect --untimed on last frame
The last video frame is another case that has a separate code path, although it's pretty similar to the one in commit 73e5aa87. Fix this in a different way, which also takes care of the last frame case, although without context the code becomes slightly more tricky. As further cleanup, move the decision about framedropping itself to the same place, so the check in vo.c becomes much simpler. The check for the vo->driver->encode flag, which is remvoed completely, was redundant too. Fixes #1480.
-rw-r--r--player/video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/video.c b/player/video.c
index 4b216af049..fd8df9cead 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) && !(opts->untimed || vo->driver->untimed))
+ if (vo_still_displaying(vo))
return;
const struct vo_driver *info = mpctx->video_out->driver;