Mercurial > mplayer.hg

changeset 10604:a70a6c12bce5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000l
author alex
date Thu, 14 Aug 2003 01:15:41 +0000
parents 9f04be042081
children 3136605e6cab
files libvo/vo_gl2.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl2.c	Thu Aug 14 01:05:49 2003 +0000
+++ b/libvo/vo_gl2.c	Thu Aug 14 01:15:41 2003 +0000
@@ -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);