[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.101,1.102

[Richard Felker CVS]

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

Modified Files:
	demux_mov.c 
Log Message:
1000000l!!!!
of course ffmpeg svq3 decoder will crash if you don't give it the ImageDesc!
now it works fine


Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- demux_mov.c	20 Sep 2003 10:10:11 -0000	1.101
+++ demux_mov.c	3 Nov 2003 06:24:59 -0000	1.102
@@ -32,9 +32,7 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#ifdef USE_QTX_CODECS
 #include "../loader/qtx/qtxsdk/components.h"
-#endif
 
 #ifdef MACOSX
 #include <QuickTime/QuickTime.h>
@@ -1005,7 +1003,6 @@
 //      82  char[4]	atom type
 //	86  ...		atom data
 
-#if defined(USE_QTX_CODECS) || defined(MACOSX)
 	{	ImageDescription* id=malloc(8+trak->stdata_len);
 		trak->desc=id;
 		id->idSize=8+trak->stdata_len;
@@ -1034,7 +1031,6 @@
 		}
 #endif
 	}
-#endif
 
 		if(trak->stdata_len >= 86) { // extra atoms found
 		  int pos=78;