[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.36,1.37

[Mike Melanson]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv28932/libmpdemux

Modified Files:
	demux_mov.c 
Log Message:
reinstated original palette decision logic from XAnim (was the QT spec
wrong on this?)


Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- demux_mov.c	10 Feb 2002 18:31:12 -0000	1.36
+++ demux_mov.c	10 Feb 2002 19:06:08 -0000	1.37
@@ -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]);