Mercurial > mplayer.hg

changeset 31086:cca95ca6f52b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle chroma texture size becoming 0, e.g. due to bad rounding.
author reimar
date Sun, 09 May 2010 00:16:46 +0000
parents 22779f940406
children 9acad2e25ea1
files libvo/gl_common.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Fri May 07 21:59:18 2010 +0000
+++ b/libvo/gl_common.c	Sun May 09 00:16:46 2010 +0000
@@ -528,8 +528,11 @@
                       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 @@
 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);