[MPlayer-cvslog] r22624 - in trunk/libmpdemux: Makefile demux_avs.c demux_mkv.c

[diego]

Author: diego
Date: Thu Mar 15 23:34:45 2007
New Revision: 22624

Modified:
   trunk/libmpdemux/Makefile
   trunk/libmpdemux/demux_avs.c
   trunk/libmpdemux/demux_mkv.c

Log:
Use explicit path for headers from the loader/ directory.


Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Thu Mar 15 23:34:45 2007
@@ -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

Modified: trunk/libmpdemux/demux_avs.c
==============================================================================
--- trunk/libmpdemux/demux_avs.c	(original)
+++ trunk/libmpdemux/demux_avs.c	Thu Mar 15 23:34:45 2007
@@ -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"

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Thu Mar 15 23:34:45 2007
@@ -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