headers cleanup

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3947 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 24 deletions

diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index bd180d4d19..9628f65d28 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.h
@@ -1,37 +1,17 @@
 #ifndef AVIFILE_DS_AUDIODECODER_H
 #define AVIFILE_DS_AUDIODECODER_H
 
-#ifndef NOAVIFILE_HEADERS
-#include "audiodecoder.h"
-#include "except.h"
-#else
-#include "libwin32.h"
-#endif
-#include "DS_Filter.h"
-
-typedef struct _DS_AudioDecoder
-{ 
-    WAVEFORMATEX in_fmt;
-    AM_MEDIA_TYPE m_sOurType, m_sDestType;
-    DS_Filter* m_pDS_Filter;
-    char* m_sVhdr;
-    char* m_sVhdr2;
-}DS_AudioDecoder;
-
-#ifndef uint_t
-#define uint_t int
-#endif
+typedef struct _DS_AudioDecoder DS_AudioDecoder;
 
 //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
 DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf);
 
 void DS_AudioDecoder_Destroy(DS_AudioDecoder *this);
 
-int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, uint_t in_size,
-			     void* out_data, uint_t out_size,
-			     uint_t* size_read, uint_t* size_written);
+int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned int in_size,
+			     void* out_data, unsigned int out_size,
+			     unsigned int* size_read, unsigned int* size_written);
 
 int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size);
 
-
 #endif // AVIFILE_DS_AUDIODECODER_H