[Sumover-dev] [svn commit] r4103 - vic/branches/mpeg4/render

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Oct  9 12:33:05 2007
New Revision: 4103

Modified:
   vic/branches/mpeg4/render/color-swscale.cpp

Log:
Fixed for 16bit displays - used with GPL version.

Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Tue Oct  9 12:33:05 2007
@@ -17,25 +17,25 @@
 class X11WindowRenderer : public WindowDitherer {
 public:
 	X11WindowRenderer(VideoWindow* vw, int decimation, int depth_) :
-		WindowDitherer(vw, decimation) { 
-	  i_width = i_height = o_width = o_height = -1;
-	  sws_context = NULL;
+	WindowDitherer(vw, decimation) { 
+	i_width = i_height = o_width = o_height = -1;
+	sws_context = NULL;
 	  
 	  // 15, 16, 24, or 32 bits
 	  switch (depth_) {
 	    case 15:
 	    case 16:
-			// printf("16\n");
+		// printf("16\n");
 	        //out_format = PIX_FMT_RGB565;
-			out_format = PIX_FMT_BGR555;
+		out_format = PIX_FMT_BGR565;
 	        bytes_per_pixel	= 2;
 	    	break;
 	    	
 	    case 24:
 		//	printf("24\n");
-			out_format = PIX_FMT_RGB24;
-			bytes_per_pixel = 3;
-			break;
+		out_format = PIX_FMT_RGB24;
+		bytes_per_pixel = 3;
+		break;
 	    case 32:
 			// printf("32\n");
 	        out_format = PIX_FMT_RGB32;