[Mplayer-cvslog] CVS: main msvidc.c,1.3,1.4

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv20494

Modified Files:
	msvidc.c 
Log Message:
added 32bpp output support

Index: msvidc.c
===================================================================
RCS file: /cvsroot/mplayer/main/msvidc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- msvidc.c	24 Nov 2001 23:28:22 -0000	1.3
+++ msvidc.c	28 Nov 2001 15:19:14 -0000	1.4
@@ -5,6 +5,8 @@
     
     The description of the algorithm you can read here:
       http://www.pcisys.net/~melanson/video1.txt
+
+    32bpp support (c) alex
 */
 
 #define LE_16(x) *(unsigned short *)(x)
@@ -131,12 +133,16 @@
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_r;
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_g;
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_b;
+		if (bytes_per_pixel == 4) /* 32bpp */
+		    pixel_ptr++;
               }
               else
               {
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_r;
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_g;
                 decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_b;
+		if (bytes_per_pixel == 4) /* 32bpp */
+		    pixel_ptr++;
               }
 
               // get the next flag ready to go
@@ -157,12 +163,16 @@
                 decoded[pixel_ptr++] = quad[0][0].c1_r;
                 decoded[pixel_ptr++] = quad[0][0].c1_g;
                 decoded[pixel_ptr++] = quad[0][0].c1_b;
+		if (bytes_per_pixel == 4) /* 32bpp */
+		    pixel_ptr++;
               }
               else
               {
                 decoded[pixel_ptr++] = quad[0][0].c2_r;
                 decoded[pixel_ptr++] = quad[0][0].c2_g;
                 decoded[pixel_ptr++] = quad[0][0].c2_b;
+		if (bytes_per_pixel == 4) /* 32bpp */
+		    pixel_ptr++;
               }
 
               // get the next flag ready to go
@@ -186,6 +196,8 @@
             decoded[pixel_ptr++] = quad[0][0].c1_r;
             decoded[pixel_ptr++] = quad[0][0].c1_g;
             decoded[pixel_ptr++] = quad[0][0].c1_b;
+	    if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
           }
           pixel_ptr -= row_dec;
         }
@@ -275,12 +287,16 @@
               decoded[pixel_ptr++] = quad[0][0].c1_r;
               decoded[pixel_ptr++] = quad[0][0].c1_g;
               decoded[pixel_ptr++] = quad[0][0].c1_b;
+	      if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
             }
             else
             {
               decoded[pixel_ptr++] = quad[0][0].c2_r;
               decoded[pixel_ptr++] = quad[0][0].c2_g;
               decoded[pixel_ptr++] = quad[0][0].c2_b;
+	      if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
             }
 
             // get the next flag ready to go
@@ -319,12 +335,16 @@
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_r;
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_g;
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_b;
+	      if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
             }
             else
             {
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_r;
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_g;
               decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_b;
+	      if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
             }
 
             // get the next flag ready to go
@@ -348,6 +368,8 @@
             decoded[pixel_ptr++] = quad[0][0].c1_r;
             decoded[pixel_ptr++] = quad[0][0].c1_g;
             decoded[pixel_ptr++] = quad[0][0].c1_b;
+	    if (bytes_per_pixel == 4) /* 32bpp */
+		pixel_ptr++;
           }
           pixel_ptr -= row_dec;
         }