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/dmo/DMO_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/dmo/DMO_VideoDecoder.c')
| -rw-r--r-- | loader/dmo/DMO_VideoDecoder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index d5a56ebefd..db0cd4c995 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -5,14 +5,14 @@ *********************************************************/ #include "config.h" -#include "dshow/guids.h" -#include "dshow/interfaces.h" -#include "registry.h" +#include "loader/dshow/guids.h" +#include "loader/dshow/interfaces.h" +#include "loader/registry.h" #ifdef WIN32_LOADER -#include "ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif -#include "dshow/libwin32.h" +#include "loader/dshow/libwin32.h" #include "DMO_Filter.h" #include "DMO_VideoDecoder.h" @@ -33,7 +33,7 @@ struct DMO_VideoDecoder //#include "DMO_VideoDecoder.h" -#include "wine/winerror.h" +#include "loader/wine/winerror.h" #include <unistd.h> #include <fcntl.h> |