Include loader/ prefix in #include path everywhere.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22595 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 19 insertions, 20 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index dd73eae969..17f7c756b9 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -150,7 +150,6 @@ SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 CFLAGS  = -Inative \
           -I../libmpdemux \
           -I../stream \
-          -I../loader \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec
diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
index 1049817dad..340dde80be 100644
--- a/libmpcodecs/ad_acm.c
+++ b/libmpcodecs/ad_acm.c
@@ -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"
diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c
index b8d7d9db28..5215945c82 100644
--- a/libmpcodecs/ad_dmo.c
+++ b/libmpcodecs/ad_dmo.c
@@ -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)
 {
diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c
index d6bc08a795..24c34966bc 100644
--- a/libmpcodecs/ad_dshow.c
+++ b/libmpcodecs/ad_dshow.c
@@ -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)
 {
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index bedc516e3e..da4feec1ab 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -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 =  {
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c
index bf6d6ab71e..7e98fe3e08 100644
--- a/libmpcodecs/ad_realaud.c
+++ b/libmpcodecs/ad_realaud.c
@@ -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",
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index b20ef96579..069e194735 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -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"
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index b25a755bdf..e2671791fe 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -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);
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index 813cbf9977..d3075d6e05 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -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",
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index 2f696f0be7..cf1c5221d5 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -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
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index bddc70d4a6..3ed6b7c4b9 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -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"
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 428cbc0e2d..72fe7cb209 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -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"