[Mplayer-cvslog] CVS: main/libvo vo_gl.c,1.31,1.32 vo_gl2.c,1.24,1.25 vo_xvidix.c,1.52,1.53

[Arpi of Ize]

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

Modified Files:
	vo_gl.c vo_gl2.c vo_xvidix.c 
Log Message:
vo_init() moved to/fixed in preinit()


Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vo_gl.c	17 Oct 2002 09:49:25 -0000	1.31
+++ vo_gl.c	27 Oct 2002 03:16:21 -0000	1.32
@@ -428,7 +428,7 @@
 	return ENOSYS;
     }
 
-	if(!vo_init()) return 1;
+    if( !vo_init() ) return -1; // Can't open X11
 
     return 0;
 }

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vo_gl2.c	16 Oct 2002 21:32:03 -0000	1.24
+++ vo_gl2.c	27 Oct 2002 03:16:21 -0000	1.25
@@ -622,8 +622,6 @@
 	image_width = width;
 	image_format = format;
   
-	if(!vo_init()) return -1;
-
 	aspect_save_orig(width,height);
 	aspect_save_prescale(d_width,d_height);
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
@@ -1108,6 +1106,7 @@
 	printf("[gl2] Unknown subdevice: %s\n",arg);
 	return ENOSYS;
     }
+    if( !vo_init() ) return -1; // Can't open X11
     return 0;
 }
 

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vo_xvidix.c	17 Oct 2002 09:49:25 -0000	1.52
+++ vo_xvidix.c	27 Oct 2002 03:16:21 -0000	1.53
@@ -416,7 +416,7 @@
 	vidix_name = NULL;
     }
 
-    if (!vo_init()) return(1);
+    if (!vo_init()) return(-1);
 
     if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
 	return(1);