From: kramm <kramm>
Date: Sun, 24 Oct 2004 17:25:38 +0000 (+0000)
Subject: renamed U16 to USHORT, to make compiling work.
X-Git-Tag: release-0-6-3~261
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=55976a64f7acb2654712bbe27aa366ee3d053e5a

renamed U16 to USHORT, to make compiling work.
---

diff --git a/avi2swf/videoreader_vfw.cc b/avi2swf/videoreader_vfw.cc
index f9558b9..207b0b7 100644
--- a/avi2swf/videoreader_vfw.cc
+++ b/avi2swf/videoreader_vfw.cc
@@ -140,7 +140,7 @@ 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;
+		USHORT c = line[0]|line[1]<<8;
 		*dest++ = 255|(c&0x1f)<<(8+3)|(c>>5&0x1f)<<(16+3)|(c>>10&0x1f)<<(24+3);
 		line+=2;
 	    }