[MPlayer-cvslog] r22595 - in trunk/libmpcodecs: Makefile ad_acm.c ad_dmo.c ad_dshow.c ad_qtaudio.c ad_realaud.c ad_twin.c vd_qtvideo.c vd_realvid.c vd_vfw.c ve_qtvideo.c ve_vfw.c

[diego]

Author: diego
Date: Thu Mar 15 09:29:24 2007
New Revision: 22595

Modified:
   trunk/libmpcodecs/Makefile
   trunk/libmpcodecs/ad_acm.c
   trunk/libmpcodecs/ad_dmo.c
   trunk/libmpcodecs/ad_dshow.c
   trunk/libmpcodecs/ad_qtaudio.c
   trunk/libmpcodecs/ad_realaud.c
   trunk/libmpcodecs/ad_twin.c
   trunk/libmpcodecs/vd_qtvideo.c
   trunk/libmpcodecs/vd_realvid.c
   trunk/libmpcodecs/vd_vfw.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/ve_vfw.c

Log:
Include loader/ prefix in #include path everywhere.


Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Thu Mar 15 09:29:24 2007
@@ -150,7 +150,6 @@ SRCS_MENCODER-$(MP3LAME)              +=
 CFLAGS  = -Inative \
           -I../libmpdemux \
           -I../stream \
-          -I../loader \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec

Modified: trunk/libmpcodecs/ad_acm.c
==============================================================================
--- trunk/libmpcodecs/ad_acm.c	(original)
+++ trunk/libmpcodecs/ad_acm.c	Thu Mar 15 09:29:24 2007
@@ -6,7 +6,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "wineacm.h"
+#include "loader/wineacm.h"
 
 #include "ad_internal.h"
 #include "osdep/timer.h"

Modified: trunk/libmpcodecs/ad_dmo.c
==============================================================================
--- trunk/libmpcodecs/ad_dmo.c	(original)
+++ trunk/libmpcodecs/ad_dmo.c	Thu Mar 15 09:29:24 2007
@@ -19,7 +19,7 @@ static ad_info_t info = 
 
 LIBAD_EXTERN(dmo)
 
-#include "dmo/DMO_AudioDecoder.h"
+#include "loader/dmo/DMO_AudioDecoder.h"
 
 static int init(sh_audio_t *sh)
 {

Modified: trunk/libmpcodecs/ad_dshow.c
==============================================================================
--- trunk/libmpcodecs/ad_dshow.c	(original)
+++ trunk/libmpcodecs/ad_dshow.c	Thu Mar 15 09:29:24 2007
@@ -19,7 +19,7 @@ static ad_info_t info = 
 
 LIBAD_EXTERN(dshow)
 
-#include "dshow/DS_AudioDecoder.h"
+#include "loader/dshow/DS_AudioDecoder.h"
 
 static int init(sh_audio_t *sh)
 {

Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c	(original)
+++ trunk/libmpcodecs/ad_qtaudio.c	Thu Mar 15 09:29:24 2007
@@ -11,13 +11,13 @@
 
 #include "mp_msg.h"
 
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 #include "ad_internal.h"
 #include "bswap.h"
 
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 static ad_info_t info =  {

Modified: trunk/libmpcodecs/ad_realaud.c
==============================================================================
--- trunk/libmpcodecs/ad_realaud.c	(original)
+++ trunk/libmpcodecs/ad_realaud.c	Thu Mar 15 09:29:24 2007
@@ -12,7 +12,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 static ad_info_t info =  {
 	"RealAudio decoder",

Modified: trunk/libmpcodecs/ad_twin.c
==============================================================================
--- trunk/libmpcodecs/ad_twin.c	(original)
+++ trunk/libmpcodecs/ad_twin.c	Thu Mar 15 09:29:24 2007
@@ -6,7 +6,7 @@
 #include "ad_internal.h"
 #include "vqf.h"
 #include "loader/ldt_keeper.h"
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 #include "libaf/af_format.h"
 
 #include "help_mp.h"

Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c	(original)
+++ trunk/libmpcodecs/vd_qtvideo.c	Thu Mar 15 09:29:24 2007
@@ -9,13 +9,13 @@
 #define dump_ImageDescription(x)
 #endif
 
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 #include "mp_msg.h"
 #include "vd_internal.h"
 
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 static vd_info_t info = {
@@ -31,7 +31,7 @@ LIBVD_EXTERN(qtvideo)
 #include "bswap.h"
 
 #ifndef MACOSX
-#include "qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 
 HMODULE   WINAPI LoadLibraryA(LPCSTR);
 FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);

Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c	(original)
+++ trunk/libmpcodecs/vd_realvid.c	Thu Mar 15 09:29:24 2007
@@ -11,7 +11,7 @@
 #include "help_mp.h"
 
 #include "vd_internal.h"
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 static vd_info_t info = {
 	"RealVideo decoder",

Modified: trunk/libmpcodecs/vd_vfw.c
==============================================================================
--- trunk/libmpcodecs/vd_vfw.c	(original)
+++ trunk/libmpcodecs/vd_vfw.c	Thu Mar 15 09:29:24 2007
@@ -7,8 +7,8 @@
 
 #include "vd_internal.h"
 
-#include "wine/driver.h"
-#include "wine/vfw.h"
+#include "loader/wine/driver.h"
+#include "loader/wine/vfw.h"
 
 static vd_info_t info = {
 #ifdef BUILD_VFWEX

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	(original)
+++ trunk/libmpcodecs/ve_qtvideo.c	Thu Mar 15 09:29:24 2007
@@ -14,11 +14,11 @@
 #include "mpbswap.h"
 
 #ifdef WIN32_LOADER 
-#include "ldt_keeper.h" 
+#include "loader/ldt_keeper.h"
 #endif 
 
 #include "loader/qtx/qtxsdk/components.h"
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 #include "codec-cfg.h"
 #include "stream.h"

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	(original)
+++ trunk/libmpcodecs/ve_vfw.c	Thu Mar 15 09:29:24 2007
@@ -15,10 +15,10 @@
 //#include "demuxer.h"
 //#include "stheader.h"
 
-#include "loader.h"
-//#include "wine/mmreg.h"
-#include "wine/vfw.h"
-#include "wine/avifmt.h"
+#include "loader/loader.h"
+//#include "loader/wine/mmreg.h"
+#include "loader/wine/vfw.h"
+#include "loader/wine/avifmt.h"
 
 #include "img_format.h"
 #include "mp_image.h"