summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
diff options
context:
space:
mode:
authormelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-10 19:06:08 +0000
committermelanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-10 19:06:08 +0000
commitc4243b6dda4407d05755a9bce289e895e2744c59 (patch)
treea4fc6965d16404b6fad222518de5aaa5023472c9 /libmpdemux/demux_mov.c
parentd1446f072f1967e1db407cae0cd9ad8954a269f0 (diff)
downloadmpv-c4243b6dda4407d05755a9bce289e895e2744c59.tar.bz2
mpv-c4243b6dda4407d05755a9bce289e895e2744c59.tar.xz
reinstated original palette decision logic from XAnim (was the QT spec
wrong on this?) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4647 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r--libmpdemux/demux_mov.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 0531dfbc2b..0ecee54da1 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -618,8 +618,9 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
palette_map = (unsigned char *)sh->bih + 40;
// load default palette
- if (flag == 0xFFFF)
+ if (flag & 0x08)
{
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Using default QT palette\n");
if (palette_count == 4)
memcpy(palette_map, qt_default_palette_4, 4 * 4);
else if (palette_count == 16)
@@ -630,6 +631,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
// load palette from file
else
{
+ mp_msg(MSGT_DEMUX, MSGL_INFO, "Loading palette from file\n");
for (i = start; i <= end; i++)
{
entry = BE_16(&trak->stdata[hdr_ptr]);