# HG changeset patch
# User diego
# Date 1173983796 0
# Node ID 4d81dbdf46b9008eb585868eb50df6568ebe8280
# Parent  ecd75dfafd40adc7777776d7a171f68931b212ef
Add explicit location for headers from the stream/ directory.

diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/Makefile	Thu Mar 15 18:36:36 2007 +0000
@@ -65,7 +65,7 @@
 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
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/asfheader.c
--- a/libmpdemux/asfheader.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/asfheader.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/aviheader.c
--- a/libmpdemux/aviheader.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/aviheader.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/aviprint.c
--- a/libmpdemux/aviprint.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/aviprint.c	Thu Mar 15 18:36:36 2007 +0000
@@ -6,7 +6,7 @@
 #include "config.h"
 
 // for avi_stream_id():
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 
 #include "aviheader.h"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_aac.c
--- a/libmpdemux/demux_aac.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_aac.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_asf.c
--- a/libmpdemux/demux_asf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_asf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_audio.c
--- a/libmpdemux/demux_audio.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_audio.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_avi.c
--- a/libmpdemux/demux_avi.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_avi.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_avs.c
--- a/libmpdemux/demux_avs.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_avs.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_demuxers.c
--- a/libmpdemux/demux_demuxers.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_demuxers.c	Thu Mar 15 18:36:36 2007 +0000
@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_film.c
--- a/libmpdemux/demux_film.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_film.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_fli.c
--- a/libmpdemux/demux_fli.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_fli.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_gif.c
--- a/libmpdemux/demux_gif.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_gif.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_lavf.c
--- a/libmpdemux/demux_lavf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_lmlm4.c
--- a/libmpdemux/demux_lmlm4.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_lmlm4.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_mf.c
--- a/libmpdemux/demux_mf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_mf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_mkv.c
--- a/libmpdemux/demux_mkv.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_mkv.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_mov.c
--- a/libmpdemux/demux_mov.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_mov.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_mpc.c
--- a/libmpdemux/demux_mpc.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_mpc.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_mpg.c
--- a/libmpdemux/demux_mpg.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_mpg.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_nsv.c
--- a/libmpdemux/demux_nsv.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_nsv.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_nut.c
--- a/libmpdemux/demux_nut.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_nut.c	Thu Mar 15 18:36:36 2007 +0000
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_nuv.c
--- a/libmpdemux/demux_nuv.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_nuv.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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" 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_ogg.c
--- a/libmpdemux/demux_ogg.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_ogg.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_pva.c
--- a/libmpdemux/demux_pva.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_pva.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_rawaudio.c
--- a/libmpdemux/demux_rawaudio.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_rawaudio.c	Thu Mar 15 18:36:36 2007 +0000
@@ -8,7 +8,7 @@
 
 #include "m_option.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_rawdv.c
--- a/libmpdemux/demux_rawdv.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_rawdv.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_rawvideo.c
--- a/libmpdemux/demux_rawvideo.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_rawvideo.c	Thu Mar 15 18:36:36 2007 +0000
@@ -8,7 +8,7 @@
 
 #include "m_option.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_real.c
--- a/libmpdemux/demux_real.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_real.c	Thu Mar 15 18:36:36 2007 +0000
@@ -28,7 +28,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_realaud.c
--- a/libmpdemux/demux_realaud.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_realaud.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_roq.c
--- a/libmpdemux/demux_roq.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_roq.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_rtp.h
--- a/libmpdemux/demux_rtp.h	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_rtp.h	Thu Mar 15 18:36:36 2007 +0000
@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
 #endif
 #ifndef __DEMUXER_H
 #include "demuxer.h"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_rtp_internal.h
--- a/libmpdemux/demux_rtp_internal.h	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_rtp_internal.h	Thu Mar 15 18:36:36 2007 +0000
@@ -5,7 +5,7 @@
 
 extern "C" {
 #ifndef __STREAM_H
-#include "stream.h"
+#include "stream/stream.h"
 #endif
 #ifndef __DEMUXER_H
 #include "demuxer.h"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_smjpeg.c
--- a/libmpdemux/demux_smjpeg.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_smjpeg.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_ts.c
--- a/libmpdemux/demux_ts.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_ts.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_ty.c
--- a/libmpdemux/demux_ty.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_ty.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_ty_osd.c
--- a/libmpdemux/demux_ty_osd.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_ty_osd.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_viv.c
--- a/libmpdemux/demux_viv.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_viv.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_vqf.c
--- a/libmpdemux/demux_vqf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_vqf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_xmms.c
--- a/libmpdemux/demux_xmms.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_xmms.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demux_y4m.c
--- a/libmpdemux/demux_y4m.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demux_y4m.c	Thu Mar 15 18:36:36 2007 +0000
@@ -12,7 +12,7 @@
 #include "help_mp.h"
 #include "yuv4mpeg.h"
 
-//#include "stream.h"
+//#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/demuxer.c	Thu Mar 15 18:36:36 2007 +0000
@@ -15,7 +15,7 @@
 
 #include "libvo/fastmemcpy.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/ebml.c
--- a/libmpdemux/ebml.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/ebml.c	Thu Mar 15 18:36:36 2007 +0000
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "ebml.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/extension.c
--- a/libmpdemux/extension.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/extension.c	Thu Mar 15 18:36:36 2007 +0000
@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 
 /*
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/mf.c
--- a/libmpdemux/mf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/mf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -19,7 +19,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "stream.h"
+#include "stream/stream.h"
 
 #include "mf.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer.c
--- a/libmpdemux/muxer.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer_avi.c
--- a/libmpdemux/muxer_avi.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer_avi.c	Thu Mar 15 18:36:36 2007 +0000
@@ -8,7 +8,7 @@
 #include "config.h"
 #include "version.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer_lavf.c
--- a/libmpdemux/muxer_lavf.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer_lavf.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer_mpeg.c
--- a/libmpdemux/muxer_mpeg.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer_mpeg.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer_rawaudio.c
--- a/libmpdemux/muxer_rawaudio.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer_rawaudio.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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){
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/muxer_rawvideo.c
--- a/libmpdemux/muxer_rawvideo.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/muxer_rawvideo.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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){
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/parse_es.c
--- a/libmpdemux/parse_es.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/parse_es.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/parse_mp4.c
--- a/libmpdemux/parse_mp4.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/parse_mp4.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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
 
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/video.c
--- a/libmpdemux/video.c	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/video.c	Thu Mar 15 18:36:36 2007 +0000
@@ -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"
diff -r ecd75dfafd40 -r 4d81dbdf46b9 libmpdemux/yuv4mpeg.h
--- a/libmpdemux/yuv4mpeg.h	Thu Mar 15 18:12:01 2007 +0000
+++ b/libmpdemux/yuv4mpeg.h	Thu Mar 15 18:36:36 2007 +0000
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 //#include "mp_msg.h"
-#include "stream.h"
+#include "stream/stream.h"