diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-16 18:32:58 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-16 18:32:58 +0000 |
| commit | 1162939b3ad5c2d1cf44a81ff1dd8a3841814de8 (patch) | |
| tree | f6162843b3f6317d501f514457d347af868b6b66 /libmpcodecs | |
| parent | 386e76a5449858e812fa5714dc9d449a8b467add (diff) | |
| download | mpv-1162939b3ad5c2d1cf44a81ff1dd8a3841814de8.tar.bz2 mpv-1162939b3ad5c2d1cf44a81ff1dd8a3841814de8.tar.xz | |
do not set the flag when config failed
patch by Mikulas Patocka (mikulas at artax karlin mff cuni cz)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17199 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 00414474ba..5df22e8a78 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -569,6 +569,7 @@ int vf_config_wrapper(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { + int r; if ((vf->default_caps&VFCAP_CONSTANT) && vf->fmt.have_configured) { if ((vf->fmt.orig_width != width) || (vf->fmt.orig_height != height) @@ -582,7 +583,9 @@ int vf_config_wrapper(struct vf_instance_s* vf, vf->fmt.orig_height = height; vf->fmt.orig_width = width; vf->fmt.orig_fmt = outfmt; - return vf->config(vf, width, height, d_width, d_height, flags, outfmt); + r = vf->config(vf, width, height, d_width, d_height, flags, outfmt); + if (!r) vf->fmt.have_configured = 0; + return r; } int vf_next_config(struct vf_instance_s* vf, |