[MPlayer-cvslog] r31143 - trunk/libvo/gl_common.c

[reimar]

Author: reimar
Date: Sun May  9 02:16:46 2010
New Revision: 31143

Log:
Handle chroma texture size becoming 0, e.g. due to bad rounding.

Modified:
   trunk/libvo/gl_common.c

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	Fri May  7 23:59:18 2010	(r31142)
+++ trunk/libvo/gl_common.c	Sun May  9 02:16:46 2010	(r31143)
@@ -528,8 +528,11 @@ void glCreateClearTex(GLenum target, GLe
                       int w, int h, unsigned char val) {
   GLfloat fval = (GLfloat)val / 255.0;
   GLfloat border[4] = {fval, fval, fval, fval};
-  int stride = w * glFmt2bpp(format, type);
+  int stride;
   char *init;
+  if (w == 0) w = 1;
+  if (h == 0) h = 1;
+  stride = w * glFmt2bpp(format, type);
   if (!stride) return;
   init = malloc(stride * h);
   memset(init, val, stride * h);
@@ -1421,6 +1424,8 @@ int glAutodetectYUVConversion(void) {
 void glSetupYUVConversion(gl_conversion_params_t *params) {
   float uvcos = params->csp_params.saturation * cos(params->csp_params.hue);
   float uvsin = params->csp_params.saturation * sin(params->csp_params.hue);
+  if (params->chrom_texw == 0) params->chrom_texw = 1;
+  if (params->chrom_texh == 0) params->chrom_texh = 1;
   switch (YUV_CONVERSION(params->type)) {
     case YUV_CONVERSION_COMBINERS:
       glSetupYUVCombiners(uvcos, uvsin);