[Mplayer-cvslog] CVS: main/libvo vo_gl.c,1.7,1.8

[Alex Beregszaszi]

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

Modified Files:
	vo_gl.c 
Log Message:
no segfault if no glx present

Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_gl.c	17 Jun 2001 01:22:09 -0000	1.7
+++ vo_gl.c	7 Jul 2001 20:53:01 -0000	1.8
@@ -80,7 +80,7 @@
 static uint32_t texture_height;
 
 static void resize(int x,int y){
-  printf("Resize: %dx%d\n",x,y);
+  printf("[gl] Resize: %dx%d\n",x,y);
   glViewport( 0, 0, x, y );
 
   glMatrixMode(GL_PROJECTION);
@@ -121,7 +121,7 @@
 
 	if (mydisplay == NULL)
 	{
-		printf("Can not open display\n");
+		printf("[gl] Can not open display\n");
 		return -1;
 	}
 
@@ -173,6 +173,11 @@
 
 //	XMatchVisualInfo(mydisplay, screen, depth, TrueColor, &vinfo);
   vinfo=glXChooseVisual( mydisplay,screen,wsGLXAttrib );
+  if (vinfo == NULL)
+  {
+    printf("[gl] no GLX support present\n");
+    return -1;
+  }
 
 	xswa.background_pixel = 0;
 	xswa.border_pixel     = 1;
@@ -239,7 +244,7 @@
 	if (myximage->byte_order != LSBFirst) 
 #endif
 	{
-		fprintf( stderr, "No support fon non-native XImage byte order!\n" );
+		printf("[gl] no support fon non-native XImage byte order!\n");
 		return -1;
 	}
 
@@ -262,7 +267,7 @@
 
   if(format==IMGFMT_YV12){
     yuv2rgb_init(8*BYTES_PP, MODE_BGR);
-    printf("YUV init OK!\n");
+    printf("[gl] YUV init OK!\n");
     image_bpp=8*BYTES_PP;
     image_bytes=BYTES_PP;
   } else {
@@ -280,7 +285,7 @@
 
   glEnable(GL_TEXTURE_2D);
 
-  printf("Creating %dx%d texture...\n",texture_width,texture_height);
+  printf("[gl] Creating %dx%d texture...\n",texture_width,texture_height);
 
 #if 1
 //  glBindTexture(GL_TEXTURE_2D, texture_id);
@@ -492,4 +497,3 @@
 uninit(void)
 {
 }
-


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog