Mercurial > mplayer.hg

changeset 4646:59eb588c7115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reinstated original palette decision logic from XAnim (was the QT spec wrong on this?)
author melanson
date Sun, 10 Feb 2002 19:06:08 +0000
parents 33c2fc18138c
children b3d18d070ec1
files libmpdemux/demux_mov.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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]);