Add explicit location for headers from the stream/ directory.

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

libmpdemux/Makefile

@@ -65,7 +65,7 @@ SRCS_MENCODER = muxer.c \
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
-CFLAGS = -I../stream -I../loader
+CFLAGS = -I../loader
 
 CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec

libmpdemux/asfheader.c

@@ -11,7 +11,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/aviheader.c

@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/aviprint.c

@@ -6,7 +6,7 @@
 #include "config.h"
 
 // for avi_stream_id():
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 
 #include "aviheader.h"

libmpdemux/demux_aac.c

@@ -6,7 +6,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"

libmpdemux/demux_asf.c

@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "asf.h"
 #include "demuxer.h"
 

libmpdemux/demux_audio.c

@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "genres.h"

libmpdemux/demux_avi.c

@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_avs.c

@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "libvo/fastmemcpy.h"

libmpdemux/demux_demuxers.c

@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_film.c

@@ -18,7 +18,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_fli.c

@@ -11,7 +11,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_gif.c

@@ -12,7 +12,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_lavf.c

@@ -25,7 +25,7 @@
 #include "mp_msg.h"
 // #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "m_option.h"

libmpdemux/demux_lmlm4.c

@@ -13,7 +13,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_mf.c

@@ -10,7 +10,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"

libmpdemux/demux_mkv.c

@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <inttypes.h>
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "ebml.h"

libmpdemux/demux_mov.c

@@ -36,7 +36,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_mpc.c

@@ -13,7 +13,7 @@
 #include "mp_msg.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_mpg.c

@@ -9,7 +9,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"

libmpdemux/demux_nsv.c

@@ -16,7 +16,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_nut.c

@@ -4,7 +4,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_nuv.c

@@ -13,7 +13,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "nuppelvideo.h" 

libmpdemux/demux_ogg.c

@@ -10,7 +10,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_pva.c

@@ -26,7 +26,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_rawaudio.c

@@ -8,7 +8,7 @@
 
 #include "m_option.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_rawdv.c

@@ -15,7 +15,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_rawvideo.c

@@ -8,7 +8,7 @@
 
 #include "m_option.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_real.c

@@ -28,7 +28,7 @@ Video codecs: (supported by RealPlayer8 for Linux)
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_realaud.c

@@ -11,7 +11,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_roq.c

@@ -13,7 +13,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_rtp.h

@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
 #endif
 #ifndef __DEMUXER_H
 #include "demuxer.h"

libmpdemux/demux_rtp_internal.h

@@ -5,7 +5,7 @@
 
 extern "C" {
 #ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
 #endif
 #ifndef __DEMUXER_H
 #include "demuxer.h"

libmpdemux/demux_smjpeg.c

@@ -17,7 +17,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_ts.c

@@ -29,7 +29,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"

libmpdemux/demux_ty.c

@@ -39,7 +39,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"

libmpdemux/demux_ty_osd.c

@@ -17,7 +17,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-//#include "stream.h"
+//#include "stream/stream.h"
 //#include "demuxer.h"
 //#include "parse_es.h"
 //#include "stheader.h"

libmpdemux/demux_viv.c

@@ -10,7 +10,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_vqf.c

@@ -5,7 +5,7 @@
 #include "libavutil/common.h"
 #include "mpbswap.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "libmpcodecs/vqf.h"

libmpdemux/demux_xmms.c

@@ -33,7 +33,7 @@
 
 #include "m_option.h"
 #include "libaf/af_format.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demux_y4m.c

@@ -12,7 +12,7 @@
 #include "help_mp.h"
 #include "yuv4mpeg.h"
 
-//#include "stream.h"
+//#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/demuxer.c

@@ -15,7 +15,7 @@
 
 #include "libvo/fastmemcpy.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"

libmpdemux/ebml.c

@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "ebml.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"

libmpdemux/extension.c

@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 
 /*

libmpdemux/mf.c

@@ -19,7 +19,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
 
 #include "mf.h"
 

libmpdemux/muxer.c

@@ -11,7 +11,7 @@
 #include "aviheader.h"
 #include "ms_hdr.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "demuxer.h"
 #include "mp_msg.h"

libmpdemux/muxer_avi.c

@@ -8,7 +8,7 @@
 #include "config.h"
 #include "version.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

libmpdemux/muxer_lavf.c

@@ -12,7 +12,7 @@
 #include "aviheader.h"
 #include "ms_hdr.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "demuxer.h"
 #include "stheader.h"

libmpdemux/muxer_mpeg.c

@@ -12,7 +12,7 @@
 #include "aviheader.h"
 #include "ms_hdr.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "demuxer.h"
 #include "stheader.h"

libmpdemux/muxer_rawaudio.c

@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "ms_hdr.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 static muxer_stream_t* rawaudiofile_new_stream(muxer_t *muxer,int type){

libmpdemux/muxer_rawvideo.c

@@ -8,13 +8,13 @@
 #include "config.h"
 #include "version.h"
 
-//#include "stream.h"
+//#include "stream/stream.h"
 //#include "demuxer.h"
 //#include "stheader.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 static muxer_stream_t* rawvideofile_new_stream(muxer_t *muxer,int type){

libmpdemux/parse_es.c

@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 

libmpdemux/parse_mp4.c

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include "parse_mp4.h"
 #include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"
 
 //#define MP4_DUMPATOM
 

libmpdemux/video.c

@@ -13,7 +13,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "parse_es.h"

libmpdemux/yuv4mpeg.h

@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 //#include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"