diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 17:39:17 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 17:39:17 +0000 |
commit | 49867bd432352d19172ab26cf873bd5651e69e25 (patch) | |
tree | c2d419bb4f81564036baa12832a44b8aac27c6d1 | |
parent | d3b998da64927403879ad588287c178f86b7c849 (diff) | |
download | mpv-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
-rw-r--r-- | Copyright | 6 | ||||
-rw-r--r-- | Gui/mplayer/common.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/gtk/fs.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/gtk/menu.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/mw.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/pb.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 2 | ||||
-rw-r--r-- | Gui/win32/dialogs.c | 2 | ||||
-rw-r--r-- | Gui/win32/gui.c | 2 | ||||
-rw-r--r-- | Gui/win32/interface.c | 4 | ||||
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | TOOLS/Makefile | 2 | ||||
-rw-r--r-- | TOOLS/netstream/Makefile | 3 | ||||
-rw-r--r-- | TOOLS/netstream/netstream.c | 4 | ||||
-rw-r--r-- | asxparser.c | 2 | ||||
-rw-r--r-- | cfg-common.h | 4 | ||||
-rw-r--r-- | libmenu/menu.c | 2 | ||||
-rw-r--r-- | libmenu/menu_dvbin.c | 2 | ||||
-rw-r--r-- | libmpcodecs/Makefile | 1 | ||||
-rw-r--r-- | libmpdemux/Makefile | 122 | ||||
-rw-r--r-- | m_option.c | 2 | ||||
-rw-r--r-- | mencoder.c | 4 | ||||
-rw-r--r-- | mplayer.c | 8 | ||||
-rw-r--r-- | osdep/macosx_finder_args.c | 2 | ||||
-rw-r--r-- | playtreeparser.c | 2 | ||||
-rw-r--r-- | stream/Makefile | 151 | ||||
-rw-r--r-- | stream/ai_alsa.c (renamed from libmpdemux/ai_alsa.c) | 0 | ||||
-rw-r--r-- | stream/ai_alsa1x.c (renamed from libmpdemux/ai_alsa1x.c) | 0 | ||||
-rw-r--r-- | stream/ai_oss.c (renamed from libmpdemux/ai_oss.c) | 0 | ||||
-rw-r--r-- | stream/asf_mmst_streaming.c (renamed from libmpdemux/asf_mmst_streaming.c) | 0 | ||||
-rw-r--r-- | stream/asf_streaming.c (renamed from libmpdemux/asf_streaming.c) | 0 | ||||
-rw-r--r-- | stream/audio_in.c (renamed from libmpdemux/audio_in.c) | 0 | ||||
-rw-r--r-- | stream/audio_in.h (renamed from libmpdemux/audio_in.h) | 0 | ||||
-rw-r--r-- | stream/cache2.c (renamed from libmpdemux/cache2.c) | 0 | ||||
-rw-r--r-- | stream/cdd.h (renamed from libmpdemux/cdd.h) | 0 | ||||
-rw-r--r-- | stream/cdda.c (renamed from libmpdemux/cdda.c) | 0 | ||||
-rw-r--r-- | stream/cddb.c (renamed from libmpdemux/cddb.c) | 0 | ||||
-rw-r--r-- | stream/cdinfo.c (renamed from libmpdemux/cdinfo.c) | 0 | ||||
-rw-r--r-- | stream/cookies.c (renamed from libmpdemux/cookies.c) | 0 | ||||
-rw-r--r-- | stream/cookies.h (renamed from libmpdemux/cookies.h) | 0 | ||||
-rw-r--r-- | stream/cue_read.c (renamed from libmpdemux/cue_read.c) | 0 | ||||
-rw-r--r-- | stream/cue_read.h (renamed from libmpdemux/cue_read.h) | 0 | ||||
-rw-r--r-- | stream/dvb_tune.c (renamed from libmpdemux/dvb_tune.c) | 0 | ||||
-rw-r--r-- | stream/dvbin.c (renamed from libmpdemux/dvbin.c) | 0 | ||||
-rw-r--r-- | stream/dvbin.h (renamed from libmpdemux/dvbin.h) | 0 | ||||
-rw-r--r-- | stream/dvdnav_stream.c (renamed from libmpdemux/dvdnav_stream.c) | 0 | ||||
-rw-r--r-- | stream/dvdnav_stream.h (renamed from libmpdemux/dvdnav_stream.h) | 0 | ||||
-rw-r--r-- | stream/freesdp/common.c (renamed from libmpdemux/freesdp/common.c) | 0 | ||||
-rw-r--r-- | stream/freesdp/common.h (renamed from libmpdemux/freesdp/common.h) | 0 | ||||
-rw-r--r-- | stream/freesdp/errorlist.c (renamed from libmpdemux/freesdp/errorlist.c) | 0 | ||||
-rw-r--r-- | stream/freesdp/parser.c (renamed from libmpdemux/freesdp/parser.c) | 0 | ||||
-rw-r--r-- | stream/freesdp/parser.h (renamed from libmpdemux/freesdp/parser.h) | 0 | ||||
-rw-r--r-- | stream/freesdp/parserpriv.h (renamed from libmpdemux/freesdp/parserpriv.h) | 0 | ||||
-rw-r--r-- | stream/freesdp/priv.h (renamed from libmpdemux/freesdp/priv.h) | 0 | ||||
-rw-r--r-- | stream/frequencies.c (renamed from libmpdemux/frequencies.c) | 0 | ||||
-rw-r--r-- | stream/frequencies.h (renamed from libmpdemux/frequencies.h) | 0 | ||||
-rw-r--r-- | stream/http.c (renamed from libmpdemux/http.c) | 0 | ||||
-rw-r--r-- | stream/http.h (renamed from libmpdemux/http.h) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp.c (renamed from libmpdemux/librtsp/rtsp.c) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp.h (renamed from libmpdemux/librtsp/rtsp.h) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp_rtp.c (renamed from libmpdemux/librtsp/rtsp_rtp.c) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp_rtp.h (renamed from libmpdemux/librtsp/rtsp_rtp.h) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp_session.c (renamed from libmpdemux/librtsp/rtsp_session.c) | 0 | ||||
-rw-r--r-- | stream/librtsp/rtsp_session.h (renamed from libmpdemux/librtsp/rtsp_session.h) | 0 | ||||
-rw-r--r-- | stream/mf.c (renamed from libmpdemux/mf.c) | 0 | ||||
-rw-r--r-- | stream/mf.h (renamed from libmpdemux/mf.h) | 0 | ||||
-rw-r--r-- | stream/netstream.h (renamed from libmpdemux/netstream.h) | 0 | ||||
-rw-r--r-- | stream/network.c (renamed from libmpdemux/network.c) | 0 | ||||
-rw-r--r-- | stream/network.h (renamed from libmpdemux/network.h) | 0 | ||||
-rw-r--r-- | stream/open.c (renamed from libmpdemux/open.c) | 0 | ||||
-rw-r--r-- | stream/pnm.c (renamed from libmpdemux/pnm.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/asmrp.c (renamed from libmpdemux/realrtsp/asmrp.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/asmrp.h (renamed from libmpdemux/realrtsp/asmrp.h) | 0 | ||||
-rw-r--r-- | stream/realrtsp/real.c (renamed from libmpdemux/realrtsp/real.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/real.h (renamed from libmpdemux/realrtsp/real.h) | 0 | ||||
-rw-r--r-- | stream/realrtsp/rmff.c (renamed from libmpdemux/realrtsp/rmff.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/rmff.h (renamed from libmpdemux/realrtsp/rmff.h) | 0 | ||||
-rw-r--r-- | stream/realrtsp/sdpplin.c (renamed from libmpdemux/realrtsp/sdpplin.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/sdpplin.h (renamed from libmpdemux/realrtsp/sdpplin.h) | 0 | ||||
-rw-r--r-- | stream/realrtsp/xbuffer.c (renamed from libmpdemux/realrtsp/xbuffer.c) | 0 | ||||
-rw-r--r-- | stream/realrtsp/xbuffer.h (renamed from libmpdemux/realrtsp/xbuffer.h) | 0 | ||||
-rw-r--r-- | stream/rtp.c (renamed from libmpdemux/rtp.c) | 0 | ||||
-rw-r--r-- | stream/rtp.h (renamed from libmpdemux/rtp.h) | 0 | ||||
-rw-r--r-- | stream/stream.c (renamed from libmpdemux/stream.c) | 0 | ||||
-rw-r--r-- | stream/stream.h (renamed from libmpdemux/stream.h) | 0 | ||||
-rw-r--r-- | stream/stream_dvd.c (renamed from libmpdemux/stream_dvd.c) | 0 | ||||
-rw-r--r-- | stream/stream_dvd.h (renamed from libmpdemux/stream_dvd.h) | 0 | ||||
-rw-r--r-- | stream/stream_file.c (renamed from libmpdemux/stream_file.c) | 0 | ||||
-rw-r--r-- | stream/stream_ftp.c (renamed from libmpdemux/stream_ftp.c) | 0 | ||||
-rw-r--r-- | stream/stream_livedotcom.c (renamed from libmpdemux/stream_livedotcom.c) | 0 | ||||
-rw-r--r-- | stream/stream_netstream.c (renamed from libmpdemux/stream_netstream.c) | 0 | ||||
-rw-r--r-- | stream/stream_null.c (renamed from libmpdemux/stream_null.c) | 0 | ||||
-rw-r--r-- | stream/stream_pvr.c (renamed from libmpdemux/stream_pvr.c) | 0 | ||||
-rw-r--r-- | stream/stream_rtsp.c (renamed from libmpdemux/stream_rtsp.c) | 0 | ||||
-rw-r--r-- | stream/stream_smb.c (renamed from libmpdemux/stream_smb.c) | 0 | ||||
-rw-r--r-- | stream/stream_vcd.c (renamed from libmpdemux/stream_vcd.c) | 0 | ||||
-rw-r--r-- | stream/stream_vstream.c (renamed from libmpdemux/stream_vstream.c) | 0 | ||||
-rw-r--r-- | stream/tv.c (renamed from libmpdemux/tv.c) | 0 | ||||
-rw-r--r-- | stream/tv.h (renamed from libmpdemux/tv.h) | 0 | ||||
-rw-r--r-- | stream/tvi_bsdbt848.c (renamed from libmpdemux/tvi_bsdbt848.c) | 0 | ||||
-rw-r--r-- | stream/tvi_def.h (renamed from libmpdemux/tvi_def.h) | 0 | ||||
-rw-r--r-- | stream/tvi_dummy.c (renamed from libmpdemux/tvi_dummy.c) | 0 | ||||
-rw-r--r-- | stream/tvi_v4l.c (renamed from libmpdemux/tvi_v4l.c) | 0 | ||||
-rw-r--r-- | stream/tvi_v4l2.c (renamed from libmpdemux/tvi_v4l2.c) | 0 | ||||
-rw-r--r-- | stream/url.c (renamed from libmpdemux/url.c) | 0 | ||||
-rw-r--r-- | stream/url.h (renamed from libmpdemux/url.h) | 0 | ||||
-rw-r--r-- | stream/vcd_read.h (renamed from libmpdemux/vcd_read.h) | 0 | ||||
-rw-r--r-- | stream/vcd_read_darwin.h (renamed from libmpdemux/vcd_read_darwin.h) | 0 | ||||
-rw-r--r-- | stream/vcd_read_fbsd.h (renamed from libmpdemux/vcd_read_fbsd.h) | 0 | ||||
-rw-r--r-- | stream/vcd_read_nbsd.h (renamed from libmpdemux/vcd_read_nbsd.h) | 0 | ||||
-rw-r--r-- | subreader.c | 2 |
111 files changed, 200 insertions, 146 deletions
@@ -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> |