Mercurial > mplayer.hg

changeset 22606:97343cedd966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use explicit path for headers from the loader/ directory.
author diego
date Thu, 15 Mar 2007 22:34:45 +0000
parents 4d81dbdf46b9
children b99edbf76db4
files libmpdemux/Makefile libmpdemux/demux_avs.c libmpdemux/demux_mkv.c
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/Makefile	Thu Mar 15 18:36:36 2007 +0000
+++ b/libmpdemux/Makefile	Thu Mar 15 22:34:45 2007 +0000
@@ -65,8 +65,6 @@
 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
--- a/libmpdemux/demux_avs.c	Thu Mar 15 18:36:36 2007 +0000
+++ b/libmpdemux/demux_avs.c	Thu Mar 15 22:34:45 2007 +0000
@@ -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"
--- a/libmpdemux/demux_mkv.c	Thu Mar 15 18:36:36 2007 +0000
+++ b/libmpdemux/demux_mkv.c	Thu Mar 15 22:34:45 2007 +0000
@@ -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