# HG changeset patch # User melanson # Date 1013367968 0 # Node ID 59eb588c7115a891676c5374bc5857b916b05ef4 # Parent 33c2fc18138c9f1f02302389998b9bed2ef259b2 reinstated original palette decision logic from XAnim (was the QT spec wrong on this?) diff -r 33c2fc18138c -r 59eb588c7115 libmpdemux/demux_mov.c --- a/libmpdemux/demux_mov.c Sun Feb 10 18:31:12 2002 +0000 +++ b/libmpdemux/demux_mov.c Sun Feb 10 19:06:08 2002 +0000 @@ -618,8 +618,9 @@ 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 @@ // 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]);