diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-17 00:29:07 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-17 00:29:07 +0000 |
| commit | 984f2f5665315d44eda3a569a8ea499b10196351 (patch) | |
| tree | 5217522cf31c218a1d12380e8f2d945bffd0535d /postproc | |
| parent | c6f5d437bcd0b6946dfc7e4fc2b31e48f50be75d (diff) | |
| download | mpv-984f2f5665315d44eda3a569a8ea499b10196351.tar.bz2 mpv-984f2f5665315d44eda3a569a8ea499b10196351.tar.xz | |
fix rgb/bgr for 15/16bpp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2231 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'postproc')
| -rw-r--r-- | postproc/swscale.c | 8 | ||||
| -rw-r--r-- | 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; } |