From d1530c64618e3a59ec9e3a82b270e777b4524029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BCnemann?= Date: Wed, 17 Oct 2001 00:29:07 +0000 Subject: [PATCH] fix rgb/bgr for 15/16bpp Originally committed as revision 2231 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc --- postproc/swscale.c | 8 ++++---- postproc/swscale_template.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/postproc/swscale.c b/postproc/swscale.c index 20eaa675b7..a1082a7bbe 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -103,11 +103,11 @@ static int s_last_ypos; dest[2]=clip_table[((Y + yuvtab_40cf[V]) >>13)]; #else unsigned short *d=dest; - unsigned int r=clip_table[((Y + yuvtab_3343[U]) >>13)]; + unsigned int b=clip_table[((Y + yuvtab_3343[U]) >>13)]; unsigned int g=clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]; - unsigned int b=clip_table[((Y + yuvtab_40cf[V]) >>13)]; - d[0]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp -// d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp + unsigned int r=clip_table[((Y + yuvtab_40cf[V]) >>13)]; +// d[0]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp + d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp #endif dest+=dstbpp; } diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 20eaa675b7..a1082a7bbe 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -103,11 +103,11 @@ static int s_last_ypos; dest[2]=clip_table[((Y + yuvtab_40cf[V]) >>13)]; #else unsigned short *d=dest; - unsigned int r=clip_table[((Y + yuvtab_3343[U]) >>13)]; + unsigned int b=clip_table[((Y + yuvtab_3343[U]) >>13)]; unsigned int g=clip_table[((Y + yuvtab_0c92[V] + yuvtab_1a1e[U]) >>13)]; - unsigned int b=clip_table[((Y + yuvtab_40cf[V]) >>13)]; - d[0]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp -// d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp + unsigned int r=clip_table[((Y + yuvtab_40cf[V]) >>13)]; +// d[0]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp + d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp #endif dest+=dstbpp; }