summaryrefslogtreecommitdiffstats
path: root/msvidc.c
diff options
context:
space:
mode:
authormelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-16 00:26:21 +0000
committermelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-16 00:26:21 +0000
commita59608c8ca062a3a325863e699e10d8b142e559c (patch)
treee7bca12eb1249303a98239102c0b4fc4e2d3106c /msvidc.c
parentbd695cbb5cfebcb6adf4e8aabf9d9971147bc438 (diff)
downloadmpv-a59608c8ca062a3a325863e699e10d8b142e559c.tar.bz2
mpv-a59608c8ca062a3a325863e699e10d8b142e559c.tar.xz
fixed endian-ness for FLI and MS Video 1 decoders; fixed padding bug in
FLI decoder and also implemented (untested due to lack of sample data) the FLI_COPY chunk type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3510 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'msvidc.c')
-rw-r--r--msvidc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/msvidc.c b/msvidc.c
index b249779f50..646927cdd0 100644
--- a/msvidc.c
+++ b/msvidc.c
@@ -9,7 +9,10 @@
32bpp support (c) alex
*/
-#define LE_16(x) *(unsigned short *)(x)
+#include "config.h"
+#include "bswap.h"
+
+#define LE_16(x) (le2me_16(*(unsigned short *)(x)))
#define DECODE_BGR555_TO_BGR888(x) \
x.c1_b = (x.c1 >> 7) & 0xF8; \
@@ -100,6 +103,7 @@ void AVI_Decode_Video1_16(
{
flags = (byte_b << 8) | byte_a;
+// quad[0][0].c1 = LE_16(&encoded[stream_ptr]);
quad[0][0].c1 = LE_16(&encoded[stream_ptr]);
stream_ptr += 2;
quad[0][0].c2 = LE_16(&encoded[stream_ptr]);