diff options
Diffstat (limited to 'loader/dshow')
-rw-r--r-- | loader/dshow/DS_AudioDecoder.c | 2 | ||||
-rw-r--r-- | loader/dshow/DS_AudioDecoder.h | 3 | ||||
-rw-r--r-- | loader/dshow/DS_Filter.c | 6 | ||||
-rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 6 | ||||
-rw-r--r-- | loader/dshow/DS_VideoDecoder.h | 3 | ||||
-rw-r--r-- | loader/dshow/allocator.c | 4 | ||||
-rw-r--r-- | loader/dshow/cmediasample.c | 2 | ||||
-rw-r--r-- | loader/dshow/guids.h | 8 | ||||
-rw-r--r-- | loader/dshow/inputpin.c | 2 | ||||
-rw-r--r-- | loader/dshow/interfaces.h | 2 | ||||
-rw-r--r-- | loader/dshow/libwin32.h | 8 | ||||
-rw-r--r-- | loader/dshow/mediatype.c | 4 | ||||
-rw-r--r-- | loader/dshow/outputpin.c | 4 |
13 files changed, 30 insertions, 24 deletions
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index b18b646160..cfa2fcb5a2 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -21,7 +21,7 @@ struct DS_AudioDecoder #include "DS_AudioDecoder.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif #include <string.h> diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h index 0b09d3b19c..157993cda3 100644 --- a/loader/dshow/DS_AudioDecoder.h +++ b/loader/dshow/DS_AudioDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DS_AUDIODECODER_H #define MPLAYER_DS_AUDIODECODER_H +#include "loader/com.h" +#include "loader/wine/mmreg.h" + typedef struct DS_AudioDecoder DS_AudioDecoder; //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c index 5fb1ec73dc..42b47b8626 100644 --- a/loader/dshow/DS_Filter.c +++ b/loader/dshow/DS_Filter.c @@ -5,12 +5,12 @@ #include "config.h" #include "DS_Filter.h" -#include "drv.h" -#include "com.h" +#include "loader/drv.h" +#include "loader/com.h" #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "win32.h" // printf macro +#include "loader/win32.h" // printf macro typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index e691bb5dc5..c0441ceacb 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -7,7 +7,7 @@ #include "config.h" #include "guids.h" #include "interfaces.h" -#include "registry.h" +#include "loader/registry.h" #include "libwin32.h" #include "DS_Filter.h" @@ -30,9 +30,9 @@ static SampleProcUserData sampleProcData; #include "DS_VideoDecoder.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif #include <unistd.h> diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h index b686554b89..f1a0898868 100644 --- a/loader/dshow/DS_VideoDecoder.h +++ b/loader/dshow/DS_VideoDecoder.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_DS_VIDEODECODER_H #define MPLAYER_DS_VIDEODECODER_H +#include "loader/com.h" +#include "loader/wine/vfw.h" + typedef struct DS_VideoDecoder DS_VideoDecoder; int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this); diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 3e0deabceb..8ead279a37 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -5,8 +5,8 @@ #include "config.h" #include "allocator.h" -#include "com.h" -#include "wine/winerror.h" +#include "loader/com.h" +#include "loader/wine/winerror.h" #include <stdio.h> #include <stdlib.h> diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index 98a864b3be..c594bae787 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -5,7 +5,7 @@ #include "cmediasample.h" #include "mediatype.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/loader/dshow/guids.h b/loader/dshow/guids.h index 5666ec3041..5bf335f907 100644 --- a/loader/dshow/guids.h +++ b/loader/dshow/guids.h @@ -7,13 +7,13 @@ under MinGW */ #ifndef GUID_DEFINED -#include "com.h" +#include "loader/com.h" #endif #ifndef VFWAPI -#include "wine/module.h" -#include "wine/windef.h" -#include "wine/vfw.h" +#include "loader/wine/module.h" +#include "loader/wine/windef.h" +#include "loader/wine/vfw.h" #endif #include "mediatype.h" diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 37d9f758fa..5c9b832f7a 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -5,7 +5,7 @@ #include "inputpin.h" #include "mediatype.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h index 8cac9712b8..5c927a55be 100644 --- a/loader/dshow/interfaces.h +++ b/loader/dshow/interfaces.h @@ -8,7 +8,7 @@ */ #include "iunk.h" -#include "com.h" +#include "loader/com.h" /* Sh*t. MSVC++ and g++ use different methods of storing vtables. */ diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index 70d5e0f006..dd25c31941 100644 --- a/loader/dshow/libwin32.h +++ b/loader/dshow/libwin32.h @@ -6,10 +6,10 @@ #include <inttypes.h> //#define FATAL(a) // you don't need exception - if you want - just fill more code -#include "wine/mmreg.h" -#include "wine/winreg.h" -#include "wine/vfw.h" -#include "com.h" +#include "loader/wine/mmreg.h" +#include "loader/wine/winreg.h" +#include "loader/wine/vfw.h" +#include "loader/com.h" typedef uint32_t fourcc_t; diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c index d6597fa767..873c303477 100644 --- a/loader/dshow/mediatype.c +++ b/loader/dshow/mediatype.c @@ -22,8 +22,8 @@ */ #include "mp_msg.h" #include "libmpcodecs/img_format.h" -#include "wine/winerror.h" -#include "com.h" +#include "loader/wine/winerror.h" +#include "loader/com.h" #include "mediatype.h" #include "libwin32.h" diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index d876f4401f..c24c29efb3 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -3,8 +3,8 @@ * http://svn.mplayerhq.hu/mplayer/trunk/ */ -#include "wine/winerror.h" -#include "wine/windef.h" +#include "loader/wine/winerror.h" +#include "loader/wine/windef.h" #include "outputpin.h" #include "mediatype.h" #include <stdio.h> |