[Mplayer-cvslog] CVS: main/loader/dmo DMO_AudioDecoder.c,1.1,1.2 DMO_VideoDecoder.c,1.1,1.2

[Arpi of Ize]

Update of /cvsroot/mplayer/main/loader/dmo
In directory mail:/var/tmp.root/cvs-serv30768/loader/dmo

Modified Files:
	DMO_AudioDecoder.c DMO_VideoDecoder.c 
Log Message:
compiler warning fixes
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: DMO_AudioDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dmo/DMO_AudioDecoder.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DMO_AudioDecoder.c	1 Dec 2002 16:38:56 -0000	1.1
+++ DMO_AudioDecoder.c	14 Dec 2002 17:56:28 -0000	1.2
@@ -10,6 +10,7 @@
 #include "except.h"
 #else
 #include "libwin32.h"
+#include "ldt_keeper.h"
 #endif
 
 #include "DMO_Filter.h"
@@ -33,6 +34,7 @@
 #define __MODULE__ "DirectShow audio decoder"
 
 typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**);
+extern void print_wave_header(WAVEFORMATEX *h);
 
 DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels)
 //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf)
@@ -83,8 +85,8 @@
     this->m_sDestType.cbFormat=18; //pWF->cbSize;
     this->m_sDestType.pbFormat=this->m_sVhdr2;
 
-print_wave_header(this->m_sVhdr);
-print_wave_header(this->m_sVhdr2);
+print_wave_header((WAVEFORMATEX *)this->m_sVhdr);
+print_wave_header((WAVEFORMATEX *)this->m_sVhdr2);
 
         this->m_pDMO_Filter = DMO_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType);
 	if( !this->m_pDMO_Filter ) {
@@ -109,8 +111,8 @@
 {
     DMO_OUTPUT_DATA_BUFFER db;
     CMediaBuffer* bufferin;
-    unsigned int written = 0;
-    unsigned int read = 0;
+    unsigned long written = 0;
+    unsigned long read = 0;
     int r = 0;
 
     if (!in_data || !out_data)

Index: DMO_VideoDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dmo/DMO_VideoDecoder.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DMO_VideoDecoder.c	26 Nov 2002 22:54:11 -0000	1.1
+++ DMO_VideoDecoder.c	14 Dec 2002 17:56:28 -0000	1.2
@@ -8,6 +8,7 @@
 #include "guids.h"
 #include "interfaces.h"
 #include "registry.h"
+#include "../ldt_keeper.h"
 
 #ifndef NOAVIFILE_HEADERS
 #include "videodecoder.h"
@@ -234,7 +235,7 @@
 		if (!result)
 		{
 		    this->m_Caps = (this->m_Caps | c->cap);
-		    printf("%.4s ", &c->fcc);
+		    printf("%.4s ", (char*) &c->fcc);
 		}
 	    }
 	    printf("\n");