summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-07 21:50:38 +0200
committerwm4 <wm4@nowhere>2014-05-07 21:50:38 +0200
commit2a783d70351f358d406641fa08448770bb1651f4 (patch)
treecbaaf397def22a5e5a6ab5513a20d8e224be092f
parentf3362e22ebd8a39419c8225c3254fbbebe57d6e9 (diff)
downloadmpv-2a783d70351f358d406641fa08448770bb1651f4.tar.bz2
mpv-2a783d70351f358d406641fa08448770bb1651f4.tar.xz
player: avoid reconfig during seeking
This probably matters only in extremely corner-case heavy testcases, such as using mf:// with a bunch of differently sized images.
-rw-r--r--player/video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/player/video.c b/player/video.c
index 957d4d86ac..688384d1de 100644
--- a/player/video.c
+++ b/player/video.c
@@ -471,7 +471,8 @@ static int video_output_image(struct MPContext *mpctx, double endpts,
return 0; // EOF so that caller displays remaining VO frames
// There was no decoded image yet - must not signal fake EOF.
- if (!vf->output_params.imgfmt)
+ // Likewise, if there's no filtered frame yet, don't reconfig yet.
+ if (!vf->output_params.imgfmt || !vf->output)
return r;
// Force draining.