summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-15 22:34:45 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-15 22:34:45 +0000
commita6eca2eef813f45deedc464001b7c02b9b122d9d (patch)
treef74215c9e5ae52f00ae22d99f1bc2bfda6154023 /libmpdemux
parente085bc8dcf9abd5b492cac5ae35988bf26cb77b4 (diff)
downloadmpv-a6eca2eef813f45deedc464001b7c02b9b122d9d.tar.bz2
mpv-a6eca2eef813f45deedc464001b7c02b9b122d9d.tar.xz
Use explicit path for headers from the loader/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/Makefile2
-rw-r--r--libmpdemux/demux_avs.c4
-rw-r--r--libmpdemux/demux_mkv.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 55e28360c5..b973c76abf 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -65,8 +65,6 @@ SRCS_MENCODER = muxer.c \
SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
-CFLAGS = -I../loader
-
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c
index e46dbc929b..81c76ec4c6 100644
--- a/libmpdemux/demux_avs.c
+++ b/libmpdemux/demux_avs.c
@@ -32,10 +32,10 @@
#include "stheader.h"
#include "libvo/fastmemcpy.h"
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
#ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
#endif
#include "demux_avs.h"
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index a197830b72..28e9cc8ded 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -29,7 +29,7 @@
#include "libass/ass_mp.h"
#ifdef USE_QTX_CODECS
-#include "qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
#endif
#ifdef HAVE_ZLIB