summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 17:39:17 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 17:39:17 +0000
commit49867bd432352d19172ab26cf873bd5651e69e25 (patch)
treec2d419bb4f81564036baa12832a44b8aac27c6d1 /Gui
parentd3b998da64927403879ad588287c178f86b7c849 (diff)
downloadmpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.bz2
mpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.xz
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/common.c2
-rw-r--r--Gui/mplayer/gtk/fs.c2
-rw-r--r--Gui/mplayer/gtk/menu.c2
-rw-r--r--Gui/mplayer/mw.c2
-rw-r--r--Gui/mplayer/pb.c2
-rw-r--r--Gui/mplayer/play.c2
-rw-r--r--Gui/win32/dialogs.c2
-rw-r--r--Gui/win32/gui.c2
-rw-r--r--Gui/win32/interface.c4
9 files changed, 10 insertions, 10 deletions
diff --git a/Gui/mplayer/common.c b/Gui/mplayer/common.c
index 08ae701de0..40bbc3f98b 100644
--- a/Gui/mplayer/common.c
+++ b/Gui/mplayer/common.c
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c
index e84efad79b..1756881c99 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/Gui/mplayer/gtk/fs.c
@@ -16,7 +16,7 @@
#include "../interface.h"
#include "../../config.h"
#include "../../help_mp.h"
-#include "../../libmpdemux/stream.h"
+#include "../../stream/stream.h"
#include "../widgets.h"
#include "fs.h"
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c
index 35d2883eda..caf23f9c0c 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/Gui/mplayer/gtk/menu.c
@@ -14,7 +14,7 @@
#include "../widgets.h"
#include "app.h"
-#include "../../libmpdemux/stream.h"
+#include "../../stream/stream.h"
#include "../../libmpdemux/demuxer.h"
#include "../pixmaps/ab.xpm"
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index 0d4416ea8a..3ac3844488 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c
index f8cad1c10b..01c0013136 100644
--- a/Gui/mplayer/pb.c
+++ b/Gui/mplayer/pb.c
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 1b35b04478..c20aae35f3 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -28,7 +28,7 @@
#include "skin/skin.h"
#include "skin/font.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
extern float rel_seek_secs;
extern int abs_seek_pos;
diff --git a/Gui/win32/dialogs.c b/Gui/win32/dialogs.c
index 1ff04f3e4e..59f45a5fc0 100644
--- a/Gui/win32/dialogs.c
+++ b/Gui/win32/dialogs.c
@@ -24,7 +24,7 @@
#include <interface.h>
#include <mp_msg.h>
#include <help_mp.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libmpdemux/demuxer.h>
#include <libmpdemux/stheader.h>
#include "gui.h"
diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c
index 57e7c9a625..a14997082e 100644
--- a/Gui/win32/gui.c
+++ b/Gui/win32/gui.c
@@ -34,7 +34,7 @@
#include <input/input.h>
#include <input/mouse.h>
#include <osdep/keycodes.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libvo/video_out.h>
#include <interface.h>
#include "gui.h"
diff --git a/Gui/win32/interface.c b/Gui/win32/interface.c
index 44eee7d5ab..61c254601e 100644
--- a/Gui/win32/interface.c
+++ b/Gui/win32/interface.c
@@ -26,11 +26,11 @@
#include <mp_msg.h>
#include <help_mp.h>
#include <codec-cfg.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libmpdemux/demuxer.h>
#include <libmpdemux/stheader.h>
#ifdef USE_DVDREAD
-#include <libmpdemux/stream_dvd.h>
+#include <stream/stream_dvd.h>
#endif
#include <input/input.h>
#include <libvo/video_out.h>