Mercurial > mplayer.hg

comparison libvo/gl_common.c @ 33606:959708d3e6f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Second GL_YCBCR_MESA format is YVYU, not YUY2.
author reimar
date Tue, 21 Jun 2011 19:44:24 +0000
parents 9b1c1b141f04
children 08a90b0e44e1
comparison
equal deleted inserted replaced
33605:f242acd22d93 33606:959708d3e6f5
294 *bpp = 8; 294 *bpp = 8;
295 *gl_format = GL_LUMINANCE; 295 *gl_format = GL_LUMINANCE;
296 *gl_type = GL_UNSIGNED_BYTE; 296 *gl_type = GL_UNSIGNED_BYTE;
297 break; 297 break;
298 case IMGFMT_UYVY: 298 case IMGFMT_UYVY:
299 case IMGFMT_YUY2: 299 // IMGFMT_YUY2 would be more logical for the _REV format,
300 // but gives clearly swapped colors.
301 case IMGFMT_YVYU:
300 *gl_texfmt = GL_YCBCR_MESA; 302 *gl_texfmt = GL_YCBCR_MESA;
301 *bpp = 16; 303 *bpp = 16;
302 *gl_format = GL_YCBCR_MESA; 304 *gl_format = GL_YCBCR_MESA;
303 *gl_type = fmt == IMGFMT_UYVY ? GL_UNSIGNED_SHORT_8_8 : GL_UNSIGNED_SHORT_8_8_REV; 305 *gl_type = fmt == IMGFMT_UYVY ? GL_UNSIGNED_SHORT_8_8 : GL_UNSIGNED_SHORT_8_8_REV;
304 break; 306 break;