[Mplayer-cvslog] CVS: main/libvo vo_gl2.c,1.30,1.31

[Alex Beregszaszi]

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

Modified Files:
	vo_gl2.c 
Log Message:
1000l

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vo_gl2.c	20 May 2003 19:30:46 -0000	1.30
+++ vo_gl2.c	14 Aug 2003 01:15:41 -0000	1.31
@@ -107,7 +107,7 @@
   if(*py>1.0) *py=1.0;
 }
 
-static void initTextures()
+static int initTextures()
 {
   unsigned char *line_1=0, *line_2=0, *mem_start=0;
   struct TexSquare *tsq=0;
@@ -164,7 +164,7 @@
       if(texture_width < 64 || texture_height < 64)
       {
       	fprintf (stderr, "GLERROR: Give up .. usable texture size not avaiable, or texture config error !\n");
-	exit(1);
+	return -1;
       }
     }
   }
@@ -281,6 +281,8 @@
 
     }	/* for all texnumx */
   }  /* for all texnumy */
+  
+  return 0;
 }
 
 static void resetTexturePointers(unsigned char *imageSource)
@@ -894,7 +896,8 @@
 
   texture_width=image_width;
   texture_height=image_height;
-  initTextures();
+  if (initTextures() < 0)
+    return -1;
 
   glDisable(GL_BLEND); 
   glDisable(GL_DEPTH_TEST);