renamed U16 to USHORT, to make compiling work.
authorkramm <kramm>
Sun, 24 Oct 2004 17:25:38 +0000 (17:25 +0000)
committerkramm <kramm>
Sun, 24 Oct 2004 17:25:38 +0000 (17:25 +0000)
avi2swf/videoreader_vfw.cc

index f9558b9..207b0b7 100644 (file)
@@ -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;
            }