diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-14 17:56:35 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-14 17:56:35 +0000 |
| commit | b987127e0e7eb90d8a0a618035a377e92f098447 (patch) | |
| tree | 93886db1483e2ad6c3901f6646638e6da6079afa /loader/dmo | |
| parent | bbeb54d80aa6d1d6945ce3b6461b7d24c57841e9 (diff) | |
| download | mpv-b987127e0e7eb90d8a0a618035a377e92f098447.tar.bz2 mpv-b987127e0e7eb90d8a0a618035a377e92f098447.tar.xz | |
compiler warning fixes
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dmo')
| -rw-r--r-- | loader/dmo/DMO_AudioDecoder.c | 10 | ||||
| -rw-r--r-- | loader/dmo/DMO_VideoDecoder.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c index f5c9a93b80..647fd8b912 100644 --- a/loader/dmo/DMO_AudioDecoder.c +++ b/loader/dmo/DMO_AudioDecoder.c @@ -10,6 +10,7 @@ #include "except.h" #else #include "libwin32.h" +#include "ldt_keeper.h" #endif #include "DMO_Filter.h" @@ -33,6 +34,7 @@ struct _DMO_AudioDecoder #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 @@ DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX 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 @@ int DMO_AudioDecoder_Convert(DMO_AudioDecoder *this, const void* in_data, unsign { 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) diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index f62a0fab74..34cb54b7c8 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -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 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHE if (!result) { this->m_Caps = (this->m_Caps | c->cap); - printf("%.4s ", &c->fcc); + printf("%.4s ", (char*) &c->fcc); } } printf("\n"); |