diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /libvo/gl_common.c | |
parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz |
Merge svn changes up to r27899
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r-- | libvo/gl_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 90272f6e80..65592932e6 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1194,7 +1194,7 @@ static void glSetupYUVFragprog(gl_conversion_params_t *params) { memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs)); else create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs); - glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i); + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &i); if (i < cur_texu) mp_msg(MSGT_VO, MSGL_ERR, "[gl] %i texture units needed for this type of YUV fragment support (found %i)\n", |