diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:39:39 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:39:39 +0200 |
| commit | 852570d342943894f109e2dbd281237a369bcceb (patch) | |
| tree | 51be0a2f91af492dc23020f5faaaeb1e9e11af7c /loader/dshow/DS_VideoDecoder.c | |
| parent | d1f0cbe5c8628d206fb0337835b0a7e99e7acc10 (diff) | |
| parent | a7a1f395c6b883b34aeaf008c0d22d6fe3dcd1c8 (diff) | |
| download | mpv-852570d342943894f109e2dbd281237a369bcceb.tar.bz2 mpv-852570d342943894f109e2dbd281237a369bcceb.tar.xz | |
Merge svn changes up to r30216
Diffstat (limited to 'loader/dshow/DS_VideoDecoder.c')
| -rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
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> |