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 #include #include -#include +#include #include #include #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 #include #include -#include +#include #include #include #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 #include #include -#include +#include #include #include #ifdef USE_DVDREAD -#include +#include #endif #include #include 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 #endif -#include +#include #include #include #include /// Netstream packets def and some helpers -#include +#include //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 #include -#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 similarity index 100% rename from libmpdemux/ai_alsa.c rename to stream/ai_alsa.c diff --git a/libmpdemux/ai_alsa1x.c b/stream/ai_alsa1x.c similarity index 100% rename from libmpdemux/ai_alsa1x.c rename to stream/ai_alsa1x.c diff --git a/libmpdemux/ai_oss.c b/stream/ai_oss.c similarity index 100% rename from libmpdemux/ai_oss.c rename to stream/ai_oss.c diff --git a/libmpdemux/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c similarity index 100% rename from libmpdemux/asf_mmst_streaming.c rename to stream/asf_mmst_streaming.c diff --git a/libmpdemux/asf_streaming.c b/stream/asf_streaming.c similarity index 100% rename from libmpdemux/asf_streaming.c rename to stream/asf_streaming.c diff --git a/libmpdemux/audio_in.c b/stream/audio_in.c similarity index 100% rename from libmpdemux/audio_in.c rename to stream/audio_in.c diff --git a/libmpdemux/audio_in.h b/stream/audio_in.h similarity index 100% rename from libmpdemux/audio_in.h rename to stream/audio_in.h diff --git a/libmpdemux/cache2.c b/stream/cache2.c similarity index 100% rename from libmpdemux/cache2.c rename to stream/cache2.c diff --git a/libmpdemux/cdd.h b/stream/cdd.h similarity index 100% rename from libmpdemux/cdd.h rename to stream/cdd.h diff --git a/libmpdemux/cdda.c b/stream/cdda.c similarity index 100% rename from libmpdemux/cdda.c rename to stream/cdda.c diff --git a/libmpdemux/cddb.c b/stream/cddb.c similarity index 100% rename from libmpdemux/cddb.c rename to stream/cddb.c diff --git a/libmpdemux/cdinfo.c b/stream/cdinfo.c similarity index 100% rename from libmpdemux/cdinfo.c rename to stream/cdinfo.c diff --git a/libmpdemux/cookies.c b/stream/cookies.c similarity index 100% rename from libmpdemux/cookies.c rename to stream/cookies.c diff --git a/libmpdemux/cookies.h b/stream/cookies.h similarity index 100% rename from libmpdemux/cookies.h rename to stream/cookies.h diff --git a/libmpdemux/cue_read.c b/stream/cue_read.c similarity index 100% rename from libmpdemux/cue_read.c rename to stream/cue_read.c diff --git a/libmpdemux/cue_read.h b/stream/cue_read.h similarity index 100% rename from libmpdemux/cue_read.h rename to stream/cue_read.h diff --git a/libmpdemux/dvb_tune.c b/stream/dvb_tune.c similarity index 100% rename from libmpdemux/dvb_tune.c rename to stream/dvb_tune.c diff --git a/libmpdemux/dvbin.c b/stream/dvbin.c similarity index 100% rename from libmpdemux/dvbin.c rename to stream/dvbin.c diff --git a/libmpdemux/dvbin.h b/stream/dvbin.h similarity index 100% rename from libmpdemux/dvbin.h rename to stream/dvbin.h diff --git a/libmpdemux/dvdnav_stream.c b/stream/dvdnav_stream.c similarity index 100% rename from libmpdemux/dvdnav_stream.c rename to stream/dvdnav_stream.c diff --git a/libmpdemux/dvdnav_stream.h b/stream/dvdnav_stream.h similarity index 100% rename from libmpdemux/dvdnav_stream.h rename to stream/dvdnav_stream.h diff --git a/libmpdemux/freesdp/common.c b/stream/freesdp/common.c similarity index 100% rename from libmpdemux/freesdp/common.c rename to stream/freesdp/common.c diff --git a/libmpdemux/freesdp/common.h b/stream/freesdp/common.h similarity index 100% rename from libmpdemux/freesdp/common.h rename to stream/freesdp/common.h diff --git a/libmpdemux/freesdp/errorlist.c b/stream/freesdp/errorlist.c similarity index 100% rename from libmpdemux/freesdp/errorlist.c rename to stream/freesdp/errorlist.c diff --git a/libmpdemux/freesdp/parser.c b/stream/freesdp/parser.c similarity index 100% rename from libmpdemux/freesdp/parser.c rename to stream/freesdp/parser.c diff --git a/libmpdemux/freesdp/parser.h b/stream/freesdp/parser.h similarity index 100% rename from libmpdemux/freesdp/parser.h rename to stream/freesdp/parser.h diff --git a/libmpdemux/freesdp/parserpriv.h b/stream/freesdp/parserpriv.h similarity index 100% rename from libmpdemux/freesdp/parserpriv.h rename to stream/freesdp/parserpriv.h diff --git a/libmpdemux/freesdp/priv.h b/stream/freesdp/priv.h similarity index 100% rename from libmpdemux/freesdp/priv.h rename to stream/freesdp/priv.h diff --git a/libmpdemux/frequencies.c b/stream/frequencies.c similarity index 100% rename from libmpdemux/frequencies.c rename to stream/frequencies.c diff --git a/libmpdemux/frequencies.h b/stream/frequencies.h similarity index 100% rename from libmpdemux/frequencies.h rename to stream/frequencies.h diff --git a/libmpdemux/http.c b/stream/http.c similarity index 100% rename from libmpdemux/http.c rename to stream/http.c diff --git a/libmpdemux/http.h b/stream/http.h similarity index 100% rename from libmpdemux/http.h rename to stream/http.h diff --git a/libmpdemux/librtsp/rtsp.c b/stream/librtsp/rtsp.c similarity index 100% rename from libmpdemux/librtsp/rtsp.c rename to stream/librtsp/rtsp.c diff --git a/libmpdemux/librtsp/rtsp.h b/stream/librtsp/rtsp.h similarity index 100% rename from libmpdemux/librtsp/rtsp.h rename to stream/librtsp/rtsp.h diff --git a/libmpdemux/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c similarity index 100% rename from libmpdemux/librtsp/rtsp_rtp.c rename to stream/librtsp/rtsp_rtp.c diff --git a/libmpdemux/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h similarity index 100% rename from libmpdemux/librtsp/rtsp_rtp.h rename to stream/librtsp/rtsp_rtp.h diff --git a/libmpdemux/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c similarity index 100% rename from libmpdemux/librtsp/rtsp_session.c rename to stream/librtsp/rtsp_session.c diff --git a/libmpdemux/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h similarity index 100% rename from libmpdemux/librtsp/rtsp_session.h rename to stream/librtsp/rtsp_session.h diff --git a/libmpdemux/mf.c b/stream/mf.c similarity index 100% rename from libmpdemux/mf.c rename to stream/mf.c diff --git a/libmpdemux/mf.h b/stream/mf.h similarity index 100% rename from libmpdemux/mf.h rename to stream/mf.h diff --git a/libmpdemux/netstream.h b/stream/netstream.h similarity index 100% rename from libmpdemux/netstream.h rename to stream/netstream.h diff --git a/libmpdemux/network.c b/stream/network.c similarity index 100% rename from libmpdemux/network.c rename to stream/network.c diff --git a/libmpdemux/network.h b/stream/network.h similarity index 100% rename from libmpdemux/network.h rename to stream/network.h diff --git a/libmpdemux/open.c b/stream/open.c similarity index 100% rename from libmpdemux/open.c rename to stream/open.c diff --git a/libmpdemux/pnm.c b/stream/pnm.c similarity index 100% rename from libmpdemux/pnm.c rename to stream/pnm.c diff --git a/libmpdemux/realrtsp/asmrp.c b/stream/realrtsp/asmrp.c similarity index 100% rename from libmpdemux/realrtsp/asmrp.c rename to stream/realrtsp/asmrp.c diff --git a/libmpdemux/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h similarity index 100% rename from libmpdemux/realrtsp/asmrp.h rename to stream/realrtsp/asmrp.h diff --git a/libmpdemux/realrtsp/real.c b/stream/realrtsp/real.c similarity index 100% rename from libmpdemux/realrtsp/real.c rename to stream/realrtsp/real.c diff --git a/libmpdemux/realrtsp/real.h b/stream/realrtsp/real.h similarity index 100% rename from libmpdemux/realrtsp/real.h rename to stream/realrtsp/real.h diff --git a/libmpdemux/realrtsp/rmff.c b/stream/realrtsp/rmff.c similarity index 100% rename from libmpdemux/realrtsp/rmff.c rename to stream/realrtsp/rmff.c diff --git a/libmpdemux/realrtsp/rmff.h b/stream/realrtsp/rmff.h similarity index 100% rename from libmpdemux/realrtsp/rmff.h rename to stream/realrtsp/rmff.h diff --git a/libmpdemux/realrtsp/sdpplin.c b/stream/realrtsp/sdpplin.c similarity index 100% rename from libmpdemux/realrtsp/sdpplin.c rename to stream/realrtsp/sdpplin.c diff --git a/libmpdemux/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h similarity index 100% rename from libmpdemux/realrtsp/sdpplin.h rename to stream/realrtsp/sdpplin.h diff --git a/libmpdemux/realrtsp/xbuffer.c b/stream/realrtsp/xbuffer.c similarity index 100% rename from libmpdemux/realrtsp/xbuffer.c rename to stream/realrtsp/xbuffer.c diff --git a/libmpdemux/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h similarity index 100% rename from libmpdemux/realrtsp/xbuffer.h rename to stream/realrtsp/xbuffer.h diff --git a/libmpdemux/rtp.c b/stream/rtp.c similarity index 100% rename from libmpdemux/rtp.c rename to stream/rtp.c diff --git a/libmpdemux/rtp.h b/stream/rtp.h similarity index 100% rename from libmpdemux/rtp.h rename to stream/rtp.h diff --git a/libmpdemux/stream.c b/stream/stream.c similarity index 100% rename from libmpdemux/stream.c rename to stream/stream.c diff --git a/libmpdemux/stream.h b/stream/stream.h similarity index 100% rename from libmpdemux/stream.h rename to stream/stream.h diff --git a/libmpdemux/stream_dvd.c b/stream/stream_dvd.c similarity index 100% rename from libmpdemux/stream_dvd.c rename to stream/stream_dvd.c diff --git a/libmpdemux/stream_dvd.h b/stream/stream_dvd.h similarity index 100% rename from libmpdemux/stream_dvd.h rename to stream/stream_dvd.h diff --git a/libmpdemux/stream_file.c b/stream/stream_file.c similarity index 100% rename from libmpdemux/stream_file.c rename to stream/stream_file.c diff --git a/libmpdemux/stream_ftp.c b/stream/stream_ftp.c similarity index 100% rename from libmpdemux/stream_ftp.c rename to stream/stream_ftp.c diff --git a/libmpdemux/stream_livedotcom.c b/stream/stream_livedotcom.c similarity index 100% rename from libmpdemux/stream_livedotcom.c rename to stream/stream_livedotcom.c diff --git a/libmpdemux/stream_netstream.c b/stream/stream_netstream.c similarity index 100% rename from libmpdemux/stream_netstream.c rename to stream/stream_netstream.c diff --git a/libmpdemux/stream_null.c b/stream/stream_null.c similarity index 100% rename from libmpdemux/stream_null.c rename to stream/stream_null.c diff --git a/libmpdemux/stream_pvr.c b/stream/stream_pvr.c similarity index 100% rename from libmpdemux/stream_pvr.c rename to stream/stream_pvr.c diff --git a/libmpdemux/stream_rtsp.c b/stream/stream_rtsp.c similarity index 100% rename from libmpdemux/stream_rtsp.c rename to stream/stream_rtsp.c diff --git a/libmpdemux/stream_smb.c b/stream/stream_smb.c similarity index 100% rename from libmpdemux/stream_smb.c rename to stream/stream_smb.c diff --git a/libmpdemux/stream_vcd.c b/stream/stream_vcd.c similarity index 100% rename from libmpdemux/stream_vcd.c rename to stream/stream_vcd.c diff --git a/libmpdemux/stream_vstream.c b/stream/stream_vstream.c similarity index 100% rename from libmpdemux/stream_vstream.c rename to stream/stream_vstream.c diff --git a/libmpdemux/tv.c b/stream/tv.c similarity index 100% rename from libmpdemux/tv.c rename to stream/tv.c diff --git a/libmpdemux/tv.h b/stream/tv.h similarity index 100% rename from libmpdemux/tv.h rename to stream/tv.h diff --git a/libmpdemux/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c similarity index 100% rename from libmpdemux/tvi_bsdbt848.c rename to stream/tvi_bsdbt848.c diff --git a/libmpdemux/tvi_def.h b/stream/tvi_def.h similarity index 100% rename from libmpdemux/tvi_def.h rename to stream/tvi_def.h diff --git a/libmpdemux/tvi_dummy.c b/stream/tvi_dummy.c similarity index 100% rename from libmpdemux/tvi_dummy.c rename to stream/tvi_dummy.c diff --git a/libmpdemux/tvi_v4l.c b/stream/tvi_v4l.c similarity index 100% rename from libmpdemux/tvi_v4l.c rename to stream/tvi_v4l.c diff --git a/libmpdemux/tvi_v4l2.c b/stream/tvi_v4l2.c similarity index 100% rename from libmpdemux/tvi_v4l2.c rename to stream/tvi_v4l2.c diff --git a/libmpdemux/url.c b/stream/url.c similarity index 100% rename from libmpdemux/url.c rename to stream/url.c diff --git a/libmpdemux/url.h b/stream/url.h similarity index 100% rename from libmpdemux/url.h rename to stream/url.h diff --git a/libmpdemux/vcd_read.h b/stream/vcd_read.h similarity index 100% rename from libmpdemux/vcd_read.h rename to stream/vcd_read.h diff --git a/libmpdemux/vcd_read_darwin.h b/stream/vcd_read_darwin.h similarity index 100% rename from libmpdemux/vcd_read_darwin.h rename to stream/vcd_read_darwin.h diff --git a/libmpdemux/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h similarity index 100% rename from libmpdemux/vcd_read_fbsd.h rename to stream/vcd_read_fbsd.h diff --git a/libmpdemux/vcd_read_nbsd.h b/stream/vcd_read_nbsd.h similarity index 100% rename from libmpdemux/vcd_read_nbsd.h rename to 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