fix rgb/bgr for 15/16bpp

git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@2231 b3059339-0415-0410-9bf9-f77b7e298cf2

fix rgb/bgr for 15/16bpp
git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@2231 b3059339-0415-0410-9bf9-f77b7e298cf2
1084f2d6 · atmos4 · a8700a47 · 1084f2d6 · 1084f2d6
Commit 1084f2d6 authored Oct 17, 2001 by atmos4
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

swscale.c swscale.c +4 -4

swscale_template.c swscale_template.c +4 -4

No files found.
--- a/swscale.c
+++ b/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)];
+	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)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp
-//	d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp
+	d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp
 #endif
 	dest+=dstbpp;
    }

--- a/swscale_template.c
+++ b/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)];
+	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)<<10)|((g>>3)<<5)|((b>>3)); // 15bpp
-//	d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp
+	d[0]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); // 16bpp
 #endif
 	dest+=dstbpp;
    }