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
This commit is contained in:
melanson 2002-02-10 19:06:08 +00:00
parent d1446f072f
commit c4243b6dda
1 changed files with 3 additions and 1 deletions

View File

@ -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]);