[Mplayer-cvslog] CVS: main/libmpdemux stheader.h,1.37,1.38 demux_mov.c,1.81,1.82

[Arpi of Ize]

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

Modified Files:
	stheader.h demux_mov.c 
Log Message:
export imagedescription for qt video codecs


Index: stheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stheader.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stheader.h	11 Nov 2002 17:28:41 -0000	1.37
+++ stheader.h	11 Nov 2002 23:46:27 -0000	1.38
@@ -108,6 +108,7 @@
   // win32-compatible codec parameters:
   AVIStreamHeader video;
   BITMAPINFOHEADER* bih;
+  void* ImageDesc; // for quicktime codecs
   // codec-specific:
   void* context;   // codec-specific stuff (usually HANDLE or struct pointer)
 } sh_video_t;

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- demux_mov.c	4 Nov 2002 20:36:51 -0000	1.81
+++ demux_mov.c	11 Nov 2002 23:46:27 -0000	1.82
@@ -1,4 +1,4 @@
-//#define USE_QTX_CODECS
+#define USE_QTX_CODECS
 
 //  QuickTime MOV file parser by A'rpi
 //  additional work by Atmos
@@ -919,7 +919,7 @@
 	{	ImageDescription* id=malloc(8+trak->stdata_len);
 		trak->desc=id;
 		id->idSize=8+trak->stdata_len;
-		id->cType=trak->fourcc;
+		id->cType=bswap_32(trak->fourcc);
 		id->version=char2short(trak->stdata,8);
 		id->revisionLevel=char2short(trak->stdata,10);
 		id->vendor=char2int(trak->stdata,12);
@@ -935,11 +935,13 @@
 		id->depth=char2short(trak->stdata,74);
 		id->clutID=char2short(trak->stdata,76);
 		memcpy(((char*)&id->clutID)+2,trak->stdata+78,trak->stdata_len-78);
-		if(1) // debug
+		sh->ImageDesc=id;
+#if 0
 		{   FILE *f=fopen("ImageDescription","wb");
 		    fwrite(id,id->idSize,1,f);
 		    fclose(f);
 		}
+#endif
 	}
 #endif