[Mplayer-cvslog] CVS: main/libmpcodecs vd.c,1.59,1.60

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv9377/libmpcodecs

Modified Files:
	vd.c 
Log Message:
10L ! Don't remove the scale filter if we don't added ourself


Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- vd.c	29 Oct 2002 23:43:23 -0000	1.59
+++ vd.c	30 Oct 2002 17:45:44 -0000	1.60
@@ -137,7 +137,7 @@
     int screen_size_x=0;//SCREEN_SIZE_X;
     int screen_size_y=0;//SCREEN_SIZE_Y;
 //    vo_functions_t* video_out=sh->video_out;
-    vf_instance_t* vf=sh->vfilter;
+    vf_instance_t* vf=sh->vfilter,*sc=NULL;
 
 #if 1
     if(!(sh->disp_w && sh->disp_h))
@@ -182,12 +182,12 @@
 	// TODO: no match - we should use conversion...
 	if(strcmp(vf->info->name,"scale")){	
 	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_CouldNotFindColorspace);
-	    vf=vf_open_filter(vf,"scale",NULL);
+	    sc=vf=vf_open_filter(vf,"scale",NULL);
 	    goto csp_again;
 	} else { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc
 	     vf_instance_t* vo, *vp = NULL, *ve;
-	     // Remove the scale filter
-	     if(strcmp(vf->info->name,"scale") == 0) {
+	     // Remove the scale filter if we added it ourself
+	     if(vf == sc) {
 	       ve = vf;
 	       vf = vf->next;
 	       vf_uninit_filter(ve);