[MPlayer-cvslog] CVS: main/libmpcodecs vf.c,1.119,1.120

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv18812

Modified Files:
	vf.c 
Log Message:
do not set the flag when config failed
patch by Mikulas Patocka (mikulas at artax karlin mff cuni cz)


Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vf.c	18 Nov 2005 14:39:22 -0000	1.119
+++ vf.c	16 Dec 2005 18:32:58 -0000	1.120
@@ -569,6 +569,7 @@
 		    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 @@
     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,