12 files changed, 38 insertions, 36 deletions
diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index 6b3196ff76..0b09d3b19c 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.h
@@ -1,5 +1,5 @@
-#ifndef AVIFILE_DS_AUDIODECODER_H
-#define AVIFILE_DS_AUDIODECODER_H
+#ifndef MPLAYER_DS_AUDIODECODER_H
+#define MPLAYER_DS_AUDIODECODER_H
 
 typedef struct DS_AudioDecoder DS_AudioDecoder;
 
@@ -14,4 +14,4 @@ int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned
 
 int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size);
 
-#endif /* AVIFILE_DS_AUDIODECODER_H */
+#endif /* MPLAYER_DS_AUDIODECODER_H */
diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h
index 69f9918424..8fda4b4ef2 100644
--- a/loader/dshow/DS_Filter.h
+++ b/loader/dshow/DS_Filter.h
@@ -1,5 +1,5 @@
-#ifndef DS_FILTER_H
-#define DS_FILTER_H
+#ifndef MPLAYER_DS_FILTER_H
+#define MPLAYER_DS_FILTER_H
 
 #include "inputpin.h"
 #include "outputpin.h"
@@ -47,4 +47,4 @@ void DS_Filter_Destroy(DS_Filter* This);
 }
 #endif
 
-#endif /* DS_FILTER_H */
+#endif /* MPLAYER_DS_FILTER_H */
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index b68c808836..b686554b89 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -1,5 +1,5 @@
-#ifndef AVIFILE_DS_VIDEODECODER_H
-#define AVIFILE_DS_VIDEODECODER_H
+#ifndef MPLAYER_DS_VIDEODECODER_H
+#define MPLAYER_DS_VIDEODECODER_H
 
 typedef struct DS_VideoDecoder DS_VideoDecoder;
 
@@ -26,4 +26,4 @@ int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
 int DS_SetAttr_DivX(char* attribute, int value);
 
 
-#endif /* AVIFILE_DS_VIDEODECODER_H */
+#endif /* MPLAYER_DS_VIDEODECODER_H */
diff --git a/loader/dshow/allocator.h b/loader/dshow/allocator.h
index 0efa3d886f..71597b3634 100644
--- a/loader/dshow/allocator.h
+++ b/loader/dshow/allocator.h
@@ -1,5 +1,5 @@
-#ifndef DS_ALLOCATOR_H
-#define DS_ALLOCATOR_H
+#ifndef MPLAYER_ALLOCATOR_H
+#define MPLAYER_ALLOCATOR_H
 
 #include "interfaces.h"
 #include "cmediasample.h"
@@ -24,4 +24,4 @@ struct MemAllocator
 
 MemAllocator* MemAllocatorCreate(void);
 
-#endif /* DS_ALLOCATOR_H */
+#endif /* MPLAYER_ALLOCATOR_H */
diff --git a/loader/dshow/cmediasample.h b/loader/dshow/cmediasample.h
index e16fd613db..a874dc2289 100644
--- a/loader/dshow/cmediasample.h
+++ b/loader/dshow/cmediasample.h
@@ -1,5 +1,5 @@
-#ifndef DS_CMEDIASAMPLE_H
-#define DS_CMEDIASAMPLE_H
+#ifndef MPLAYER_CMEDIASAMPLE_H
+#define MPLAYER_CMEDIASAMPLE_H
 
 #include "interfaces.h"
 #include "guids.h"
@@ -29,4 +29,4 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size);
 // called from allocator
 void CMediaSample_Destroy(CMediaSample* This);
 
-#endif /* DS_CMEDIASAMPLE_H */
+#endif /* MPLAYER_CMEDIASAMPLE_H */
diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h
index a29c309aef..5666ec3041 100644
--- a/loader/dshow/guids.h
+++ b/loader/dshow/guids.h
@@ -1,5 +1,5 @@
-#ifndef DS_GUIDS_H
-#define DS_GUIDS_H
+#ifndef MPLAYER_GUIDS_H
+#define MPLAYER_GUIDS_H
 
 /*
 this will be defined if <ole2.h> already included before this file
@@ -82,4 +82,4 @@ extern const GUID FORMAT_WaveFormatEx;
 extern const GUID MEDIATYPE_Audio;
 extern const GUID MEDIASUBTYPE_PCM;
 
-#endif /* DS_GUIDS_H */
+#endif /* MPLAYER_GUIDS_H */
diff --git a/loader/dshow/inputpin.h b/loader/dshow/inputpin.h
index b36b2f0739..02f1c8b98f 100644
--- a/loader/dshow/inputpin.h
+++ b/loader/dshow/inputpin.h
@@ -1,5 +1,5 @@
-#ifndef DS_INPUTPIN_H
-#define DS_INPUTPIN_H
+#ifndef MPLAYER_INPUTPIN_H
+#define MPLAYER_INPUTPIN_H
 
 #include "interfaces.h"
 
@@ -67,4 +67,4 @@ typedef struct
 
 CRemotePin2* CRemotePin2Create(CBaseFilter2* parent);
 
-#endif /* DS_INPUTPIN_H */
+#endif /* MPLAYER_INPUTPIN_H */
diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h
index ffa5753370..8cac9712b8 100644
--- a/loader/dshow/interfaces.h
+++ b/loader/dshow/interfaces.h
@@ -1,5 +1,5 @@
-#ifndef DS_INTERFACES_H
-#define DS_INTERFACES_H
+#ifndef MPLAYER_INTERFACES_H
+#define MPLAYER_INTERFACES_H
 
 /*
  * Definition of important DirectShow interfaces.
@@ -329,4 +329,4 @@ struct IDivxFilterInterface_vt
     HRESULT STDCALL ( *get_AspectRatio )(IDivxFilterInterface* This, int* x, IDivxFilterInterface* Thisit, int* y);
 };
 
-#endif  /* DS_INTERFACES_H */
+#endif  /*MPLAYER_INTERFACES_H */
diff --git a/loader/dshow/iunk.h b/loader/dshow/iunk.h
index e50c09fee5..0c2aee300b 100644
--- a/loader/dshow/iunk.h
+++ b/loader/dshow/iunk.h
@@ -3,8 +3,8 @@
  * http://svn.mplayerhq.hu/mplayer/trunk/
  */
 
-#ifndef DS_IUNK_H
-#define DS_IUNK_H
+#ifndef MPLAYER_IUNK_H
+#define MPLAYER_IUNK_H
 
 #include "guids.h"
 
@@ -51,4 +51,4 @@ static long STDCALL CLASSNAME ## _Release(IUnknown * This) \
     return 0; 					\
 }
 
-#endif /* DS_IUNK_H */
+#endif /* MPLAYER_IUNK_H */
diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h
index 762c8e86b5..7570072649 100644
--- a/loader/dshow/libwin32.h
+++ b/loader/dshow/libwin32.h
@@ -1,5 +1,5 @@
-#ifndef LIBWIN32_H
-#define LIBWIN32_H
+#ifndef MPLAYER_LIBWIN32_H
+#define MPLAYER_LIBWIN32_H
 
 #define VFW_E_NOT_RUNNING               0x80040226
 
@@ -253,4 +253,4 @@ struct IRtConfig
 #define fccYVU9 mmioFOURCC('Y', 'V', 'U', '9')/* Planar 4:1:0 */
 #define fccIF09 mmioFOURCC('I', 'F', '0', '9')/* Planar 4:1:0 + delta */
 
-#endif /* LIBWIN32_H */
+#endif /* MPLAYER_LIBWIN32_H */
diff --git a/loader/dshow/mediatype.h b/loader/dshow/mediatype.h
index 9e3734545c..c58bb32e9f 100644
--- a/loader/dshow/mediatype.h
+++ b/loader/dshow/mediatype.h
@@ -3,8 +3,10 @@
     AM_MEDIA_TYPE service functions declarations
 -------------------------------------------------------------------
 */
-#ifndef DS_MEDIATYPE_H
-#define DS_MEDIATYPE_H
+
+#ifndef MPLAYER_MEDIATYPE_H
+#define MPLAYER_MEDIATYPE_H
+
 #include "guids.h"
                   
 typedef struct __attribute__((__packed__)) MediaType
@@ -91,4 +93,4 @@ AM_MEDIA_TYPE* CreateMediaType(const AM_MEDIA_TYPE* pSrc);
  */
 int CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, int bWildcards);
 
-#endif /* DS_MEDIA_TYPE_H */
+#endif /* MPLAYER_MEDIA_TYPE_H */
diff --git a/loader/dshow/outputpin.h b/loader/dshow/outputpin.h
index 03c5134f8b..111ea17a56 100644
--- a/loader/dshow/outputpin.h
+++ b/loader/dshow/outputpin.h
@@ -1,5 +1,5 @@
-#ifndef DS_OUTPUTPIN_H
-#define DS_OUTPUTPIN_H
+#ifndef MPLAYER_OUTPUTPIN_H
+#define MPLAYER_OUTPUTPIN_H
 
 /* "output pin" - the one that connects to output of filter. */
 
@@ -29,4 +29,4 @@ struct COutputPin
 
 COutputPin* COutputPinCreate(const AM_MEDIA_TYPE* amt,SAMPLEPROC SampleProc,void* pUserData);
 
-#endif /* DS_OUTPUTPIN_H */
+#endif /* MPLAYER_OUTPUTPIN_H */