Add explicit location for headers from the libmpdemux/ directory.

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

24 files changed, 62 insertions, 64 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 943798275e..502a3cf987 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -147,8 +147,6 @@ SRCS_MENCODER-$(TWOLAME)              += ae_twolame.c
 SRCS_MENCODER-$(MP3LAME)              += ae_lame.c
 
 
-CFLAGS  = -I../libmpdemux \
-
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec
 
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index bf7a169ad6..f74b959d9e 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -9,8 +9,8 @@
 #include "config.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 #include "ad.h"
 
 /* Missed vorbis, mad, dshow */
diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h
index 7a270ed1e8..5e579ce35a 100644
--- a/libmpcodecs/ad_internal.h
+++ b/libmpcodecs/ad_internal.h
@@ -3,8 +3,8 @@
 #include "libaf/af_format.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "ad.h"
 
diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c
index a588ef2831..ea7979c64c 100644
--- a/libmpcodecs/ad_libdv.c
+++ b/libmpcodecs/ad_libdv.c
@@ -15,8 +15,8 @@
 #include <libdv/dv_types.h>
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "ad_internal.h"
 
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
index 311be69b35..31fe0cc841 100644
--- a/libmpcodecs/ae.c
+++ b/libmpcodecs/ae.c
@@ -5,10 +5,10 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <math.h>
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "ae.h"
 #include "config.h"
 
diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c
index f5d76cb383..891aea1fb9 100644
--- a/libmpcodecs/ae_faac.c
+++ b/libmpcodecs/ae_faac.c
@@ -6,11 +6,11 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
 #include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include <faac.h>
 #include "ae.h"
 
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index f66c458427..0f32f2db01 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -6,10 +6,10 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "help_mp.h"
 #include "ae_pcm.h"
 #include "libaf/af_format.h"
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index 0badd19f85..b16bcccb68 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -6,10 +6,10 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
-#include "ms_hdr.h"
+#include "libmpdemux/aviheader.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"
 #include "config.h"
diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c
index 90fce1a323..f8d3ababf9 100644
--- a/libmpcodecs/ae_pcm.c
+++ b/libmpcodecs/ae_pcm.c
@@ -6,11 +6,11 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
 #include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "ae_pcm.h"
 
 
diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c
index 109ea1bc62..e74f52eea9 100644
--- a/libmpcodecs/ae_toolame.c
+++ b/libmpcodecs/ae_toolame.c
@@ -6,11 +6,11 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
 #include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "ae_toolame.h"
 #include "libmpdemux/mp3_hdr.h"
 
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c
index 2c9e4a447d..34b5e3123e 100644
--- a/libmpcodecs/ae_twolame.c
+++ b/libmpcodecs/ae_twolame.c
@@ -6,11 +6,11 @@
 #include <sys/types.h>
 #include "m_option.h"
 #include "mp_msg.h"
-#include "aviheader.h"
+#include "libmpdemux/aviheader.h"
 #include "libaf/af_format.h"
-#include "ms_hdr.h"
+#include "libmpdemux/ms_hdr.h"
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 #include "ae_twolame.h"
 #include "libmpdemux/mp3_hdr.h"
 
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 63c8813d1f..4fc7fac8f4 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -7,10 +7,10 @@
 #include "help_mp.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 #include "codec-cfg.h"
-#include "stheader.h"
+#include "libmpdemux/stheader.h"
 
 #include "dec_audio.h"
 #include "ad.h"
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index cd4d67bc20..3d389bbfdf 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -15,14 +15,14 @@
 #include "osdep/shmem.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "parse_es.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/parse_es.h"
 
 #include "codec-cfg.h"
 
 #include "libvo/video_out.h"
 
-#include "stheader.h"
+#include "libmpdemux/stheader.h"
 #include "vd.h"
 #include "vf.h"
 
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 639f6c6df0..0188c36eb8 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -18,8 +18,8 @@
 #include "img_format.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 #include "dec_video.h"
 
 #include "vd.h"
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index dcb32964f1..57aede310b 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -3,8 +3,8 @@
 #include "img_format.h"
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "vd.h"
 
diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c
index bed9ee7aca..d19d1d524e 100644
--- a/libmpcodecs/vd_libdv.c
+++ b/libmpcodecs/vd_libdv.c
@@ -13,8 +13,8 @@
 #include <libdv/dv_types.h>
 
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "vd_internal.h"
 
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 381c701564..ca344fa455 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -17,10 +17,10 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index 4c5755ff59..fab9628d3c 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -10,11 +10,11 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index b7eeef293a..38ef091dff 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -9,11 +9,11 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index 458b28cb99..7dacc08d44 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -22,11 +22,11 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c
index 85ad422cfb..ef44155b59 100644
--- a/libmpcodecs/ve_raw.c
+++ b/libmpcodecs/ve_raw.c
@@ -8,11 +8,11 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 4b0e8c9805..77d1a45270 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -12,8 +12,8 @@
 
 #include "codec-cfg.h"
 //#include "stream/stream.h"
-//#include "demuxer.h"
-//#include "stheader.h"
+//#include "libmpdemux/demuxer.h"
+//#include "libmpdemux/stheader.h"
 
 #include "loader/loader.h"
 //#include "loader/wine/mmreg.h"
@@ -25,7 +25,7 @@
 #include "vf.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index a195273fbb..eeb39ba639 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -36,11 +36,11 @@
 #include "m_option.h"
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index f85ece17de..0533bbc8b7 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -38,11 +38,11 @@
 
 #include "codec-cfg.h"
 #include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "stream/stream.h"
-#include "muxer.h"
+#include "libmpdemux/muxer.h"
 
 #include "img_format.h"
 #include "mp_image.h"