From 2a783d70351f358d406641fa08448770bb1651f4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 7 May 2014 21:50:38 +0200
Subject: 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.
---
 player/video.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'player/video.c')

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.
-- 
cgit v1.2.3