111 files changed, 200 insertions, 146 deletions

diff --git a/Copyright b/Copyright
index 6329d0547f..cef48918ee 100644
--- a/Copyright
+++ b/Copyright
@@ -71,13 +71,13 @@ License:    GNU General Public License
 Name:       dvbstream
 Version:    0.4.3-pre3 (cvs checkout)
 Homepage:   http://www.linuxstb.org/dvbstream/
-Directory:  libmpdemux
+Directory:  stream
 License:    GNU General Public License
 
 Name:       realrtsp
 Version:    xine CVS 2003/04/17 + patches
 Homepage:   http://www.xinehq.de
-Directory:  libmpdemux/realrtsp/
+Directory:  stream/realrtsp/
 License:    GNU General Public License
 
 Name:       id3edit
@@ -107,5 +107,5 @@ License:    GNU Lesser General Public License
 Name:       FreeSDP
 Version:    0.4.1
 Homepage:   https://savannah.nongnu.org/projects/freesdp/
-Directory:  libmpdemux/freesdp/
+Directory:  stream/freesdp/
 License:    GNU General Public License
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>
diff --git a/Makefile b/Makefile
index 45786f10bc..b6e7167268 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
+              stream/stream.a \
               libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
@@ -139,6 +140,7 @@ CODEC_LIBS += $(FAAC_LIB)
 endif
 
 PARTS = libmpdemux \
+        stream \
         libmpcodecs \
         libavutil \
         libavcodec \
@@ -195,6 +197,7 @@ endif
 COMMON_DEPS = $(W32_DEP) \
               $(AV_DEP) \
               libmpdemux/libmpdemux.a \
+              stream/stream.a \
               libmpcodecs/libmpcodecs.a \
               libao2/libao2.a \
               osdep/libosdep.a \
@@ -274,6 +277,9 @@ libass/libass.a:
 libmpdemux/libmpdemux.a:
 	$(MAKE) -C libmpdemux
 
+stream/stream.a:
+	$(MAKE) -C stream
+
 libmpcodecs/libmpcodecs.a:
 	$(MAKE) -C libmpcodecs
 
@@ -546,6 +552,7 @@ libaf/libaf.a: $(wildcard libaf/*.[ch])
 libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch])
 
 libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
+stream/stream.a: $(wildcard stream/*.[ch] stream/*/*.[ch])
 libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
 libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
 
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index 817fe33a23..0433525109 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -31,7 +31,7 @@ subrip: subrip.c
           ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm
 
 vivodump: vivodump.c
-	$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a
+	$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a
 
 fastmemcpybench: fastmemcpybench.c
 	$(CC) $(CFLAGS) -g $< -o fastmem-mmx  ../libvo/aclib.o -DNAME=\"mmx\"      -DHAVE_MMX
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile
index e07505dde5..1f5173c106 100644
--- a/TOOLS/netstream/Makefile
+++ b/TOOLS/netstream/Makefile
@@ -19,6 +19,7 @@ all: netstream
 # FIXME: linking is a mess that should be fixed properly some day
 # it does not work with either GUI, live.com or libavformat enabled
 DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
+	$(MPROOT)/stream/stream.a \
 	$(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
 	$(MPROOT)/libmpcodecs/native/minilzo.o \
 	$(MPROOT)/libvo/aclib.o \
@@ -45,7 +46,7 @@ ifeq ($(TARGET_WIN32),yes)
 DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32
 endif
 
-netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o
+netstream: $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdemux/stream.a netstream.o
 
 	$(CC) $(CFLAGS) netstream.o -o netstream $(DEPS)
 
diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c
index 73a0bec1d5..0f8b698436 100644
--- a/TOOLS/netstream/netstream.c
+++ b/TOOLS/netstream/netstream.c
@@ -41,13 +41,13 @@
 #include <ws2tcpip.h>
 #endif
 
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
 #include <libmpdemux/demuxer.h>
 #include <mp_msg.h>
 #include <bswap.h>
 
 /// Netstream packets def and some helpers
-#include <libmpdemux/netstream.h>
+#include <stream/netstream.h>
 
 
 //Set some standard variables
diff --git a/asxparser.c b/asxparser.c
index 1bd8047c23..4b02aeb25d 100644
--- a/asxparser.c
+++ b/asxparser.c
@@ -8,7 +8,7 @@
 
 #include "playtree.h"
 #include "playtreeparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "asxparser.h"
 #include "mp_msg.h"
diff --git a/cfg-common.h b/cfg-common.h
index f27698b782..35b804ed4f 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -366,7 +366,7 @@ extern int ts_prog;
 extern int ts_keep_broken;
 extern off_t ts_probe;
 
-#include "libmpdemux/tv.h"
+#include "stream/tv.h"
 
 extern char* edl_filename;
 extern char* edl_output_filename;
@@ -444,7 +444,7 @@ m_option_t pvropts_conf[]={
 #endif
 
 #ifdef HAS_DVBIN_SUPPORT
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
 extern m_config_t dvbin_opts_conf[];
 #endif
 
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 6798ca761e..247faf8461 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -13,7 +13,7 @@
 #include "libvo/font_load.h"
 #include "osdep/keycodes.h"
 #include "asxparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c
index 6450a8d3b4..f3525f293f 100644
--- a/libmenu/menu_dvbin.c
+++ b/libmenu/menu_dvbin.c
@@ -24,7 +24,7 @@
 #include "input/input.h"
 #include "osdep/keycodes.h"
 
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
 
 
 
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 7c9a53ae17..1b0dc07e5b 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -321,6 +321,7 @@ CFLAGS  = $(OPTFLAGS) \
           -I. -I.. \
           -Inative \
           -I../libmpdemux \
+          -I../stream \
           -I../loader \
           $(LIBAV_INC) \
           -D_GNU_SOURCE \
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 5340f9b939..97c59aa0fc 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -12,89 +12,15 @@ SRCS  = mp3_hdr.c \
 
 # Core
 SRCS += extension.c \
-        mf.c \
-        open.c \
-        url.c \
         video.c \
 
-ifeq ($(STREAM_CACHE),yes)
-SRCS += cache2.c
-endif
-
 # Miscellaneous
-SRCS += cdinfo.c \
-        cue_read.c \
-        parse_es.c \
+SRCS += parse_es.c \
         parse_mp4.c \
         mpeg_packetizer.c \
         yuv4mpeg.c \
         yuv4mpeg_ratio.c \
 
-ifeq ($(CDDA),yes)
-SRCS += cdda.c
-  ifeq ($(MPLAYER_NETWORK),yes)
-  SRCS += cddb.c
-  endif
-endif
-
-# Stream readers/writers
-SRCS += stream.c \
-        stream_file.c \
-        stream_null.c \
-
-ifeq ($(HAVE_DVD),yes)
-SRCS += stream_dvd.c
-endif
-ifeq ($(DVDNAV),yes)
-SRCS += dvdnav_stream.c
-endif
-ifeq ($(VCD),yes)
-SRCS += stream_vcd.c
-endif
-ifeq ($(FTP),yes)
-SRCS += stream_ftp.c
-endif
-ifeq ($(LIBSMBCLIENT),yes)
-SRCS += stream_smb.c
-endif
-ifeq ($(MPLAYER_NETWORK),yes)
-  SRCS += stream_netstream.c
-  ifeq ($(STREAMING_LIVE555),yes)
-  SRCS += stream_livedotcom.c
-  endif
-endif
-ifeq ($(VSTREAM),yes)
-SRCS += stream_vstream.c
-endif
-
-# TV in
-ifeq ($(TV),yes)
-SRCS += tv.c frequencies.c tvi_dummy.c
-  ifeq ($(TV_BSDBT848),yes)
-  SRCS += tvi_bsdbt848.c
-  endif
-  ifeq ($(TV_V4L2),yes)
-  SRCS += tvi_v4l2.c audio_in.c
-    ifeq ($(PVR),yes)
-    SRCS += stream_pvr.c
-    endif
-  endif
-  ifeq ($(TV_V4L1),yes)
-  SRCS += tvi_v4l.c audio_in.c
-  endif
-  ifeq ($(TV_V4L),yes)
-    ifeq ($(ALSA1X),yes)
-     SRCS += ai_alsa1x.c
-    endif
-    ifeq ($(ALSA9),yes)
-     SRCS += ai_alsa.c
-    endif
-    ifeq ($(OSS),yes)
-     SRCS += ai_oss.c
-    endif
-  endif
-endif
-
 # Demuxers
 SRCS += demuxer.c \
         demux_aac.c \
@@ -166,48 +92,18 @@ SRCS   += demux_lavf.c
 MUXERS += muxer_lavf.c
 endif
 
-ifeq ($(MPLAYER_NETWORK),yes)
-SRCS += asf_streaming.c \
-        http.c \
-        network.c \
-        cookies.c \
-        asf_mmst_streaming.c \
-        pnm.c \
-        rtp.c \
-        stream_rtsp.c \
-
-SRCS += realrtsp/asmrp.c \
-        realrtsp/real.c \
-        realrtsp/rmff.c \
-        realrtsp/sdpplin.c \
-        realrtsp/xbuffer.c \
-
-SRCS += librtsp/rtsp.c \
-        librtsp/rtsp_rtp.c \
-        librtsp/rtsp_session.c \
-
-SRCS += freesdp/common.c \
-        freesdp/errorlist.c \
-        freesdp/parser.c \
+ifeq ($(MENCODER),yes)
+SRCS += $(MUXERS)
+endif
 
 ifeq ($(STREAMING_LIVE555),yes)
 CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
 CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
 endif
-endif
-
-ifeq ($(DVBIN),yes)
-SRCS += dvbin.c
-SRCS += dvb_tune.c
-endif
-
-ifeq ($(MENCODER),yes)
-SRCS += $(MUXERS)
-endif
 
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
-INCLUDE = -I.. -I../loader $(LIBAV_INC)
+INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
 CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
 CPLUSPLUS = $(CC)
@@ -229,16 +125,14 @@ $(LIBNAME):	$(OBJS)
 
 test:	$(LIBNAME) test.c
 	$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
-	  ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
+	  ./libmpdemux.a ../stream/stream.a \
+	  ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
 	  ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
 	  ../m_option.o ../subreader.o \
 	  $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
 
 clean:
-	rm -f *.o *.a *~ \
-	realrtsp/*.o realrtsp/*.a realrtsp/*~ \
-	librtsp/*.o librtsp/*.a librtsp/*~ \
-	freesdp/*.o freesdp/*.a freesdp/*~
+	rm -f *.o *.a *~
 
 distclean: clean
 	rm -f .depend test
diff --git a/m_option.c b/m_option.c
index 6ed3b57e97..64c3b71720 100644
--- a/m_option.c
+++ b/m_option.c
@@ -15,7 +15,7 @@
 #include "m_option.h"
 //#include "m_config.h"
 #include "mp_msg.h"
-#include "libmpdemux/url.h"
+#include "stream/url.h"
 
 // Don't free for 'production' atm
 #ifndef MP_DEBUG
diff --git a/mencoder.c b/mencoder.c
index e7d9637586..9441034f85 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -48,7 +48,7 @@
 #include "m_config.h"
 #include "parser-mecmd.h"
 
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "libmpdemux/mp3_hdr.h"
@@ -76,7 +76,7 @@
 #include "get_path.c"
 
 #ifdef USE_DVDREAD
-#include "libmpdemux/stream_dvd.h"
+#include "stream/stream_dvd.h"
 #endif
 
 #ifdef USE_LIBAVCODEC
diff --git a/mplayer.c b/mplayer.c
index b7c0032335..8b695a5f7e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -106,11 +106,11 @@ char * proc_priority=NULL;
 #endif /* HAVE_RTC */
 
 #ifdef USE_TV
-#include "libmpdemux/tv.h"
+#include "stream/tv.h"
 #endif
 
 #ifdef HAS_DVBIN_SUPPORT
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
 static int last_dvb_step = 1;
 static int dvbin_reopen = 0;
 extern void cache_uninit(stream_t *s);
@@ -175,14 +175,14 @@ void xscreensaver_heartbeat(void);
 
 static int max_framesize=0;
 
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 //#include "parse_es.h"
 #include "libmpdemux/matroska.h"
 
 #ifdef USE_DVDREAD
-#include "libmpdemux/stream_dvd.h"
+#include "stream/stream_dvd.h"
 #endif
 
 #include "libmpcodecs/dec_audio.h"
diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c
index 16d95303c0..7312969eab 100644
--- a/osdep/macosx_finder_args.c
+++ b/osdep/macosx_finder_args.c
@@ -1,6 +1,6 @@
 #include <Carbon/Carbon.h>
 #include <ApplicationServices/ApplicationServices.h>
-#include "libmpdemux/url.h"
+#include "stream/url.h"
 #include "mp_msg.h"
 #include "m_option.h"
 #include "m_config.h"
diff --git a/playtreeparser.c b/playtreeparser.c
index a56bdbf6a1..3beae049c2 100644
--- a/playtreeparser.c
+++ b/playtreeparser.c
@@ -18,7 +18,7 @@
 #include "m_config.h"
 #include "playtree.h"
 #include "playtreeparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "mp_msg.h"
 
diff --git a/stream/Makefile b/stream/Makefile
new file mode 100644
index 0000000000..5815c3b0c5
--- /dev/null
+++ b/stream/Makefile
@@ -0,0 +1,151 @@
+
+LIBNAME = stream.a
+
+include ../config.mak
+
+# Core
+SRCS += mf.c \
+        open.c \
+        url.c \
+
+ifeq ($(STREAM_CACHE),yes)
+SRCS += cache2.c
+endif
+
+# Miscellaneous
+SRCS += cdinfo.c \
+        cue_read.c \
+
+ifeq ($(CDDA),yes)
+SRCS += cdda.c
+  ifeq ($(MPLAYER_NETWORK),yes)
+  SRCS += cddb.c
+  endif
+endif
+
+# Stream readers/writers
+SRCS += stream.c \
+        stream_file.c \
+        stream_null.c \
+
+ifeq ($(HAVE_DVD),yes)
+SRCS += stream_dvd.c
+endif
+ifeq ($(DVDNAV),yes)
+SRCS += dvdnav_stream.c
+endif
+ifeq ($(VCD),yes)
+SRCS += stream_vcd.c
+endif
+ifeq ($(FTP),yes)
+SRCS += stream_ftp.c
+endif
+ifeq ($(LIBSMBCLIENT),yes)
+SRCS += stream_smb.c
+endif
+ifeq ($(MPLAYER_NETWORK),yes)
+  SRCS += stream_netstream.c
+  ifeq ($(STREAMING_LIVE555),yes)
+  SRCS += stream_livedotcom.c
+  endif
+endif
+ifeq ($(VSTREAM),yes)
+SRCS += stream_vstream.c
+endif
+
+# TV in
+ifeq ($(TV),yes)
+SRCS += tv.c frequencies.c tvi_dummy.c
+  ifeq ($(TV_BSDBT848),yes)
+  SRCS += tvi_bsdbt848.c
+  endif
+  ifeq ($(TV_V4L2),yes)
+  SRCS += tvi_v4l2.c audio_in.c
+    ifeq ($(PVR),yes)
+    SRCS += stream_pvr.c
+    endif
+  endif
+  ifeq ($(TV_V4L1),yes)
+  SRCS += tvi_v4l.c audio_in.c
+  endif
+  ifeq ($(TV_V4L),yes)
+    ifeq ($(ALSA1X),yes)
+     SRCS += ai_alsa1x.c
+    endif
+    ifeq ($(ALSA9),yes)
+     SRCS += ai_alsa.c
+    endif
+    ifeq ($(OSS),yes)
+     SRCS += ai_oss.c
+    endif
+  endif
+endif
+
+ifeq ($(MPLAYER_NETWORK),yes)
+SRCS += asf_streaming.c \
+        http.c \
+        network.c \
+        cookies.c \
+        asf_mmst_streaming.c \
+        pnm.c \
+        rtp.c \
+        stream_rtsp.c \
+
+SRCS += realrtsp/asmrp.c \
+        realrtsp/real.c \
+        realrtsp/rmff.c \
+        realrtsp/sdpplin.c \
+        realrtsp/xbuffer.c \
+
+SRCS += librtsp/rtsp.c \
+        librtsp/rtsp_rtp.c \
+        librtsp/rtsp_session.c \
+
+SRCS += freesdp/common.c \
+        freesdp/errorlist.c \
+        freesdp/parser.c \
+
+endif
+
+ifeq ($(DVBIN),yes)
+SRCS += dvbin.c
+SRCS += dvb_tune.c
+endif
+
+OBJS	= $(SRCS:.c=.o)
+INCLUDE = -I.. -I../libmpdemux -I../loader $(LIBAV_INC)
+CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
+
+.SUFFIXES: .c .o
+
+# .PHONY: all clean
+
+all:	$(LIBNAME)
+
+.c.o:
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+$(LIBNAME):	$(OBJS)
+	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
+
+clean:
+	rm -f *.o *.a *~ \
+	realrtsp/*.o realrtsp/*.a realrtsp/*~ \
+	librtsp/*.o librtsp/*.a librtsp/*~ \
+	freesdp/*.o freesdp/*.a freesdp/*~
+
+distclean: clean
+	rm -f .depend test
+
+dep:    depend
+
+depend:
+	$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
diff --git a/libmpdemux/ai_alsa.c b/stream/ai_alsa.c
index a1468bed09..a1468bed09 100644
--- a/libmpdemux/ai_alsa.c
+++ b/stream/ai_alsa.c
diff --git a/libmpdemux/ai_alsa1x.c b/stream/ai_alsa1x.c
index d0c6af0f98..d0c6af0f98 100644
--- a/libmpdemux/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
diff --git a/libmpdemux/ai_oss.c b/stream/ai_oss.c
index bd7c7c312a..bd7c7c312a 100644
--- a/libmpdemux/ai_oss.c
+++ b/stream/ai_oss.c
diff --git a/libmpdemux/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c
index ae1bb58509..ae1bb58509 100644
--- a/libmpdemux/asf_mmst_streaming.c
+++ b/stream/asf_mmst_streaming.c
diff --git a/libmpdemux/asf_streaming.c b/stream/asf_streaming.c
index 0ba53bfb23..0ba53bfb23 100644
--- a/libmpdemux/asf_streaming.c
+++ b/stream/asf_streaming.c
diff --git a/libmpdemux/audio_in.c b/stream/audio_in.c
index 03259614a4..03259614a4 100644
--- a/libmpdemux/audio_in.c
+++ b/stream/audio_in.c
diff --git a/libmpdemux/audio_in.h b/stream/audio_in.h
index c4b3ea91a7..c4b3ea91a7 100644
--- a/libmpdemux/audio_in.h
+++ b/stream/audio_in.h
diff --git a/libmpdemux/cache2.c b/stream/cache2.c
index 6ad33d8664..6ad33d8664 100644
--- a/libmpdemux/cache2.c
+++ b/stream/cache2.c
diff --git a/libmpdemux/cdd.h b/stream/cdd.h
index ad8a7c150c..ad8a7c150c 100644
--- a/libmpdemux/cdd.h
+++ b/stream/cdd.h
diff --git a/libmpdemux/cdda.c b/stream/cdda.c
index 2757f8ccab..2757f8ccab 100644
--- a/libmpdemux/cdda.c
+++ b/stream/cdda.c
diff --git a/libmpdemux/cddb.c b/stream/cddb.c
index 2bc127029e..2bc127029e 100644
--- a/libmpdemux/cddb.c
+++ b/stream/cddb.c
diff --git a/libmpdemux/cdinfo.c b/stream/cdinfo.c
index 8fd835439b..8fd835439b 100644
--- a/libmpdemux/cdinfo.c
+++ b/stream/cdinfo.c
diff --git a/libmpdemux/cookies.c b/stream/cookies.c
index 3a828f8d5e..3a828f8d5e 100644
--- a/libmpdemux/cookies.c
+++ b/stream/cookies.c
diff --git a/libmpdemux/cookies.h b/stream/cookies.h
index e4b1f13f9b..e4b1f13f9b 100644
--- a/libmpdemux/cookies.h
+++ b/stream/cookies.h
diff --git a/libmpdemux/cue_read.c b/stream/cue_read.c
index ecd568fa27..ecd568fa27 100644
--- a/libmpdemux/cue_read.c
+++ b/stream/cue_read.c
diff --git a/libmpdemux/cue_read.h b/stream/cue_read.h
index b52826bdfa..b52826bdfa 100644
--- a/libmpdemux/cue_read.h
+++ b/stream/cue_read.h
diff --git a/libmpdemux/dvb_tune.c b/stream/dvb_tune.c
index 166908e506..166908e506 100644
--- a/libmpdemux/dvb_tune.c
+++ b/stream/dvb_tune.c
diff --git a/libmpdemux/dvbin.c b/stream/dvbin.c
index 7fa92e0663..7fa92e0663 100644
--- a/libmpdemux/dvbin.c
+++ b/stream/dvbin.c
diff --git a/libmpdemux/dvbin.h b/stream/dvbin.h
index 18cdf4f933..18cdf4f933 100644
--- a/libmpdemux/dvbin.h
+++ b/stream/dvbin.h
diff --git a/libmpdemux/dvdnav_stream.c b/stream/dvdnav_stream.c
index fefb7ecf12..fefb7ecf12 100644
--- a/libmpdemux/dvdnav_stream.c
+++ b/stream/dvdnav_stream.c
diff --git a/libmpdemux/dvdnav_stream.h b/stream/dvdnav_stream.h
index fdea2d97f6..fdea2d97f6 100644
--- a/libmpdemux/dvdnav_stream.h
+++ b/stream/dvdnav_stream.h
diff --git a/libmpdemux/freesdp/common.c b/stream/freesdp/common.c
index 6ea625d2ed..6ea625d2ed 100644
--- a/libmpdemux/freesdp/common.c
+++ b/stream/freesdp/common.c
diff --git a/libmpdemux/freesdp/common.h b/stream/freesdp/common.h
index ae59406049..ae59406049 100644
--- a/libmpdemux/freesdp/common.h
+++ b/stream/freesdp/common.h
diff --git a/libmpdemux/freesdp/errorlist.c b/stream/freesdp/errorlist.c
index e934cd6da5..e934cd6da5 100644
--- a/libmpdemux/freesdp/errorlist.c
+++ b/stream/freesdp/errorlist.c
diff --git a/libmpdemux/freesdp/parser.c b/stream/freesdp/parser.c
index 0d6f97238f..0d6f97238f 100644
--- a/libmpdemux/freesdp/parser.c
+++ b/stream/freesdp/parser.c
diff --git a/libmpdemux/freesdp/parser.h b/stream/freesdp/parser.h
index 80c61d0115..80c61d0115 100644
--- a/libmpdemux/freesdp/parser.h
+++ b/stream/freesdp/parser.h
diff --git a/libmpdemux/freesdp/parserpriv.h b/stream/freesdp/parserpriv.h
index 9d44102d31..9d44102d31 100644
--- a/libmpdemux/freesdp/parserpriv.h
+++ b/stream/freesdp/parserpriv.h
diff --git a/libmpdemux/freesdp/priv.h b/stream/freesdp/priv.h
index c39a493c5f..c39a493c5f 100644
--- a/libmpdemux/freesdp/priv.h
+++ b/stream/freesdp/priv.h
diff --git a/libmpdemux/frequencies.c b/stream/frequencies.c
index 38eea35aa0..38eea35aa0 100644
--- a/libmpdemux/frequencies.c
+++ b/stream/frequencies.c
diff --git a/libmpdemux/frequencies.h b/stream/frequencies.h
index 13cf111f44..13cf111f44 100644
--- a/libmpdemux/frequencies.h
+++ b/stream/frequencies.h
diff --git a/libmpdemux/http.c b/stream/http.c
index ce7738427a..ce7738427a 100644
--- a/libmpdemux/http.c
+++ b/stream/http.c
diff --git a/libmpdemux/http.h b/stream/http.h
index 628de0f4e3..628de0f4e3 100644
--- a/libmpdemux/http.h
+++ b/stream/http.h
diff --git a/libmpdemux/librtsp/rtsp.c b/stream/librtsp/rtsp.c
index 16a77f77d5..16a77f77d5 100644
--- a/libmpdemux/librtsp/rtsp.c
+++ b/stream/librtsp/rtsp.c
diff --git a/libmpdemux/librtsp/rtsp.h b/stream/librtsp/rtsp.h
index eefdd79d51..eefdd79d51 100644
--- a/libmpdemux/librtsp/rtsp.h
+++ b/stream/librtsp/rtsp.h
diff --git a/libmpdemux/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c
index b6cfd065a1..b6cfd065a1 100644
--- a/libmpdemux/librtsp/rtsp_rtp.c
+++ b/stream/librtsp/rtsp_rtp.c
diff --git a/libmpdemux/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h
index 117a09e57b..117a09e57b 100644
--- a/libmpdemux/librtsp/rtsp_rtp.h
+++ b/stream/librtsp/rtsp_rtp.h
diff --git a/libmpdemux/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c
index fc8aa807f8..fc8aa807f8 100644
--- a/libmpdemux/librtsp/rtsp_session.c
+++ b/stream/librtsp/rtsp_session.c
diff --git a/libmpdemux/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h
index e955e939b1..e955e939b1 100644
--- a/libmpdemux/librtsp/rtsp_session.h
+++ b/stream/librtsp/rtsp_session.h
diff --git a/libmpdemux/mf.c b/stream/mf.c
index 2c05ea0e35..2c05ea0e35 100644
--- a/libmpdemux/mf.c
+++ b/stream/mf.c
diff --git a/libmpdemux/mf.h b/stream/mf.h
index b288063a28..b288063a28 100644
--- a/libmpdemux/mf.h
+++ b/stream/mf.h
diff --git a/libmpdemux/netstream.h b/stream/netstream.h
index 61abfc8e8a..61abfc8e8a 100644
--- a/libmpdemux/netstream.h
+++ b/stream/netstream.h
diff --git a/libmpdemux/network.c b/stream/network.c
index d9e18f7e94..d9e18f7e94 100644
--- a/libmpdemux/network.c
+++ b/stream/network.c
diff --git a/libmpdemux/network.h b/stream/network.h
index bb659fa6ba..bb659fa6ba 100644
--- a/libmpdemux/network.h
+++ b/stream/network.h
diff --git a/libmpdemux/open.c b/stream/open.c
index 5fcfa5b508..5fcfa5b508 100644
--- a/libmpdemux/open.c
+++ b/stream/open.c
diff --git a/libmpdemux/pnm.c b/stream/pnm.c
index 033772d8d9..033772d8d9 100644
--- a/libmpdemux/pnm.c
+++ b/stream/pnm.c
diff --git a/libmpdemux/realrtsp/asmrp.c b/stream/realrtsp/asmrp.c
index 05953daeb8..05953daeb8 100644
--- a/libmpdemux/realrtsp/asmrp.c
+++ b/stream/realrtsp/asmrp.c
diff --git a/libmpdemux/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h
index 7cbd37d74a..7cbd37d74a 100644
--- a/libmpdemux/realrtsp/asmrp.h
+++ b/stream/realrtsp/asmrp.h
diff --git a/libmpdemux/realrtsp/real.c b/stream/realrtsp/real.c
index 00c0c124b3..00c0c124b3 100644
--- a/libmpdemux/realrtsp/real.c
+++ b/stream/realrtsp/real.c
diff --git a/libmpdemux/realrtsp/real.h b/stream/realrtsp/real.h
index d0fe3fe306..d0fe3fe306 100644
--- a/libmpdemux/realrtsp/real.h
+++ b/stream/realrtsp/real.h
diff --git a/libmpdemux/realrtsp/rmff.c b/stream/realrtsp/rmff.c
index fc2e469391..fc2e469391 100644
--- a/libmpdemux/realrtsp/rmff.c
+++ b/stream/realrtsp/rmff.c
diff --git a/libmpdemux/realrtsp/rmff.h b/stream/realrtsp/rmff.h
index 7ea75a04aa..7ea75a04aa 100644
--- a/libmpdemux/realrtsp/rmff.h
+++ b/stream/realrtsp/rmff.h
diff --git a/libmpdemux/realrtsp/sdpplin.c b/stream/realrtsp/sdpplin.c
index 359fe10678..359fe10678 100644
--- a/libmpdemux/realrtsp/sdpplin.c
+++ b/stream/realrtsp/sdpplin.c
diff --git a/libmpdemux/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h
index 2872a40f5e..2872a40f5e 100644
--- a/libmpdemux/realrtsp/sdpplin.h
+++ b/stream/realrtsp/sdpplin.h
diff --git a/libmpdemux/realrtsp/xbuffer.c b/stream/realrtsp/xbuffer.c
index de68125ef1..de68125ef1 100644
--- a/libmpdemux/realrtsp/xbuffer.c
+++ b/stream/realrtsp/xbuffer.c
diff --git a/libmpdemux/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h
index 0ee66c789f..0ee66c789f 100644
--- a/libmpdemux/realrtsp/xbuffer.h
+++ b/stream/realrtsp/xbuffer.h
diff --git a/libmpdemux/rtp.c b/stream/rtp.c
index 4309175e97..4309175e97 100644
--- a/libmpdemux/rtp.c
+++ b/stream/rtp.c
diff --git a/libmpdemux/rtp.h b/stream/rtp.h
index c244eff2f4..c244eff2f4 100644
--- a/libmpdemux/rtp.h
+++ b/stream/rtp.h
diff --git a/libmpdemux/stream.c b/stream/stream.c
index f1b12ae827..f1b12ae827 100644
--- a/libmpdemux/stream.c
+++ b/stream/stream.c
diff --git a/libmpdemux/stream.h b/stream/stream.h
index acbdc8f5a3..acbdc8f5a3 100644
--- a/libmpdemux/stream.h
+++ b/stream/stream.h
diff --git a/libmpdemux/stream_dvd.c b/stream/stream_dvd.c
index 2abed6061c..2abed6061c 100644
--- a/libmpdemux/stream_dvd.c
+++ b/stream/stream_dvd.c
diff --git a/libmpdemux/stream_dvd.h b/stream/stream_dvd.h
index f734dc4c04..f734dc4c04 100644
--- a/libmpdemux/stream_dvd.h
+++ b/stream/stream_dvd.h
diff --git a/libmpdemux/stream_file.c b/stream/stream_file.c
index ba2c3b133c..ba2c3b133c 100644
--- a/libmpdemux/stream_file.c
+++ b/stream/stream_file.c
diff --git a/libmpdemux/stream_ftp.c b/stream/stream_ftp.c
index 2f82aa2210..2f82aa2210 100644
--- a/libmpdemux/stream_ftp.c
+++ b/stream/stream_ftp.c
diff --git a/libmpdemux/stream_livedotcom.c b/stream/stream_livedotcom.c
index 51f6e72fa3..51f6e72fa3 100644
--- a/libmpdemux/stream_livedotcom.c
+++ b/stream/stream_livedotcom.c
diff --git a/libmpdemux/stream_netstream.c b/stream/stream_netstream.c
index 753b9d7320..753b9d7320 100644
--- a/libmpdemux/stream_netstream.c
+++ b/stream/stream_netstream.c
diff --git a/libmpdemux/stream_null.c b/stream/stream_null.c
index a494c7810d..a494c7810d 100644
--- a/libmpdemux/stream_null.c
+++ b/stream/stream_null.c
diff --git a/libmpdemux/stream_pvr.c b/stream/stream_pvr.c
index f060b94796..f060b94796 100644
--- a/libmpdemux/stream_pvr.c
+++ b/stream/stream_pvr.c
diff --git a/libmpdemux/stream_rtsp.c b/stream/stream_rtsp.c
index d39294c8b9..d39294c8b9 100644
--- a/libmpdemux/stream_rtsp.c
+++ b/stream/stream_rtsp.c
diff --git a/libmpdemux/stream_smb.c b/stream/stream_smb.c
index 21c8d39e5d..21c8d39e5d 100644
--- a/libmpdemux/stream_smb.c
+++ b/stream/stream_smb.c
diff --git a/libmpdemux/stream_vcd.c b/stream/stream_vcd.c
index 528a8d43d2..528a8d43d2 100644
--- a/libmpdemux/stream_vcd.c
+++ b/stream/stream_vcd.c
diff --git a/libmpdemux/stream_vstream.c b/stream/stream_vstream.c
index 180700a2fe..180700a2fe 100644
--- a/libmpdemux/stream_vstream.c
+++ b/stream/stream_vstream.c
diff --git a/libmpdemux/tv.c b/stream/tv.c
index 74ac7e39fc..74ac7e39fc 100644
--- a/libmpdemux/tv.c
+++ b/stream/tv.c
diff --git a/libmpdemux/tv.h b/stream/tv.h
index 6a4f03b98d..6a4f03b98d 100644
--- a/libmpdemux/tv.h
+++ b/stream/tv.h
diff --git a/libmpdemux/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c
index 7732d017de..7732d017de 100644
--- a/libmpdemux/tvi_bsdbt848.c
+++ b/stream/tvi_bsdbt848.c
diff --git a/libmpdemux/tvi_def.h b/stream/tvi_def.h
index 27b797c603..27b797c603 100644
--- a/libmpdemux/tvi_def.h
+++ b/stream/tvi_def.h
diff --git a/libmpdemux/tvi_dummy.c b/stream/tvi_dummy.c
index 152ce0938c..152ce0938c 100644
--- a/libmpdemux/tvi_dummy.c
+++ b/stream/tvi_dummy.c
diff --git a/libmpdemux/tvi_v4l.c b/stream/tvi_v4l.c
index 1fa3874228..1fa3874228 100644
--- a/libmpdemux/tvi_v4l.c
+++ b/stream/tvi_v4l.c
diff --git a/libmpdemux/tvi_v4l2.c b/stream/tvi_v4l2.c
index 049d34e37c..049d34e37c 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
diff --git a/libmpdemux/url.c b/stream/url.c
index 52b850609b..52b850609b 100644
--- a/libmpdemux/url.c
+++ b/stream/url.c
diff --git a/libmpdemux/url.h b/stream/url.h
index e344e75c85..e344e75c85 100644
--- a/libmpdemux/url.h
+++ b/stream/url.h
diff --git a/libmpdemux/vcd_read.h b/stream/vcd_read.h
index 7cd4218eff..7cd4218eff 100644
--- a/libmpdemux/vcd_read.h
+++ b/stream/vcd_read.h
diff --git a/libmpdemux/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 95b540bf48..95b540bf48 100644
--- a/libmpdemux/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
diff --git a/libmpdemux/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index c416555137..c416555137 100644
--- a/libmpdemux/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
diff --git a/libmpdemux/vcd_read_nbsd.h b/stream/vcd_read_nbsd.h
index c45a63b7d7..c45a63b7d7 100644
--- a/libmpdemux/vcd_read_nbsd.h
+++ b/stream/vcd_read_nbsd.h
diff --git a/subreader.c b/subreader.c
index 3a8bd497ca..1d9da98cc1 100644
--- a/subreader.c
+++ b/subreader.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "subreader.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
 
 #ifdef HAVE_ENCA
 #include <enca.h>