15 files changed, 22 insertions, 22 deletions
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
index e14c8e868b..311be69b35 100644
--- a/libmpcodecs/ae.c
+++ b/libmpcodecs/ae.c
@@ -7,7 +7,7 @@
 #include <math.h>
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae.h"
 #include "config.h"
diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c
index 1f8f423518..f5d76cb383 100644
--- a/libmpcodecs/ae_faac.c
+++ b/libmpcodecs/ae_faac.c
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include <faac.h>
 #include "ae.h"
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index f7b74a94b7..f66c458427 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "help_mp.h"
 #include "ae_pcm.h"
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index d8b0e2c865..0badd19f85 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"
diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c
index 895fe9623e..90fce1a323 100644
--- a/libmpcodecs/ae_pcm.c
+++ b/libmpcodecs/ae_pcm.c
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_pcm.h"
 
diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c
index aba61db80c..109ea1bc62 100644
--- a/libmpcodecs/ae_toolame.c
+++ b/libmpcodecs/ae_toolame.c
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_toolame.h"
 #include "libmpdemux/mp3_hdr.h"
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c
index 0cf25a0504..2c9e4a447d 100644
--- a/libmpcodecs/ae_twolame.c
+++ b/libmpcodecs/ae_twolame.c
@@ -9,7 +9,7 @@
 #include "aviheader.h"
 #include "libaf/af_format.h"
 #include "ms_hdr.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 #include "ae_twolame.h"
 #include "libmpdemux/mp3_hdr.h"
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index fc59a94a6c..381c701564 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -16,7 +16,7 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index ae61b5eb12..4c5755ff59 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -9,11 +9,11 @@
 #include "mp_msg.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index d20e4f105a..b7eeef293a 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -8,11 +8,11 @@
 #include "m_option.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index 3ed6b7c4b9..458b28cb99 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -21,11 +21,11 @@
 #include "loader/wine/windef.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"
diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c
index 878f4feeab..85ad422cfb 100644
--- a/libmpcodecs/ve_raw.c
+++ b/libmpcodecs/ve_raw.c
@@ -7,11 +7,11 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 72fe7cb209..4b0e8c9805 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -11,7 +11,7 @@
 #include "help_mp.h"
 
 #include "codec-cfg.h"
-//#include "stream.h"
+//#include "stream/stream.h"
 //#include "demuxer.h"
 //#include "stheader.h"
 
@@ -24,7 +24,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 //===========================================================================//
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index e40f3986d4..a195273fbb 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -35,11 +35,11 @@
 
 #include "m_option.h"
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index b69103ca0c..f85ece17de 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -37,11 +37,11 @@
 #include "mp_msg.h"
 
 #include "codec-cfg.h"
-#include "stream.h"
+#include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "stream.h"
+#include "stream/stream.h"
 #include "muxer.h"
 
 #include "img_format.h"