summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-14 01:15:41 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-14 01:15:41 +0000
commit379ad8406e472407184ce6a309bf753bfd94b1ad (patch)
tree397a39ae11a30b3a687b4c758b83a412596dcd51
parent97762d4d57894fad591e2288675e28932062d37b (diff)
downloadmpv-379ad8406e472407184ce6a309bf753bfd94b1ad.tar.bz2
mpv-379ad8406e472407184ce6a309bf753bfd94b1ad.tar.xz
1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10605 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_gl2.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index c678f839c7..f2e0d66cf6 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -107,7 +107,7 @@ static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py)
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 @@ static void initTextures()
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 @@ static void initTextures()
} /* for all texnumx */
} /* for all texnumy */
+
+ return 0;
}
static void resetTexturePointers(unsigned char *imageSource)
@@ -894,7 +896,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
texture_width=image_width;
texture_height=image_height;
- initTextures();
+ if (initTextures() < 0)
+ return -1;
glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);