X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fvideoreader_vfw.cc;h=5a6a8d3c6ad714773bec13262e92cedbfc1f8bf1;hb=220a1591241e99c5f054c82b39abac1c4ed8c0b3;hp=f9558b983a8f3ab367ceb0ecde6bbdb87d3d69f5;hpb=bb669965012032ebb8225f6a2c013093af5baf53;p=swftools.git

diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc
index f9558b9..5a6a8d3 100644
--- a/avi2swf/videoreader_vfw.cc
+++ b/avi2swf/videoreader_vfw.cc
@@ -140,8 +140,8 @@ static int bitmap_to_rgba(BITMAPINFOHEADER*bi, void*buffer, const int dest_width
 	    UCHAR*line = &img[linex*y];
 	    int x;
 	    for(x=0;x<dest_width;x++) {
-		U16 c = line[0]|line[1]<<8;
-		*dest++ = 255|(c&0x1f)<<(8+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(24+3);
+		USHORT c = line[0]|line[1]<<8;
+		*dest++ = 255|(c&0x1f)<<(24+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(8+3);
 		line+=2;
 	    }
 	}