[Mplayer-cvslog] CVS: main/libvo vo_xvmc.c,1.11,1.12

Ivan Kalvachev CVS syncmail at mplayerhq.hu
Mon Aug 23 11:52:28 CEST 2004


CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv27343

Modified Files:
	vo_xvmc.c 
Log Message:
prevent XFree execution on wrong condition

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_xvmc.c	20 Aug 2004 09:41:13 -0000	1.11
+++ vo_xvmc.c	23 Aug 2004 09:52:25 -0000	1.12
@@ -207,8 +207,8 @@
    if(keycolor_handling == AUTO_COLORKEY){
    //XV_AUTOPING_COLORKEY doesn't work for XvMC yet(NVidia 43.63)
       attributes = XvQueryPortAttributes(mDisplay, xv_port, &attrib_count);
-      if(attributes!=NULL)
-         for (i = 0; i < attrib_count; i++)
+      if(attributes!=NULL){
+         for (i = 0; i < attrib_count; i++){
             if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY"))
             {
                xv_atom = XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False);
@@ -220,7 +220,9 @@
                }
                break;
             }
+	 }
          XFree(attributes);
+      }
    }
 
    xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False);




More information about the MPlayer-cvslog mailing list