Mercurial > mplayer.hg

changeset 25730:2428200918a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create/allocate conversion textures before scaler textures. Allows overriding gamma ramp texture also when using a non-trivial scaler.
author reimar
date Tue, 15 Jan 2008 18:14:00 +0000
parents 9a96fd14d1c5
children 7b0af0594814
files libvo/gl_common.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Tue Jan 15 17:59:20 2008 +0000
+++ b/libvo/gl_common.c	Tue Jan 15 18:14:00 2008 +0000
@@ -1160,13 +1160,13 @@
   float ry, ru, rv, rc;
   float gy, gu, gv, gc;
   float by, bu, bv, bc;
+  create_conv_textures(YUV_CONVERSION(type), &cur_texu, conv_texs,
+      brightness, contrast, uvcos, uvsin, rgamma, ggamma, bgamma);
   create_scaler_textures(YUV_LUM_SCALER(type), &cur_texu, lum_scale_texs);
   if (YUV_CHROM_SCALER(type) == YUV_LUM_SCALER(type))
     memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs));
   else
     create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs);
-  create_conv_textures(YUV_CONVERSION(type), &cur_texu, conv_texs,
-      brightness, contrast, uvcos, uvsin, rgamma, ggamma, bgamma);
   glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i);
   if (i < cur_texu)
     mp_msg(MSGT_VO, MSGL_ERR,