Index: libmpcodecs/Makefile =================================================================== --- libmpcodecs/Makefile (revision 19262) +++ libmpcodecs/Makefile (working copy) @@ -321,6 +321,7 @@ -I. -I.. \ -Inative \ -I../libmpdemux \ + -I../libstream \ -I../loader \ $(LIBAV_INC) \ -D_GNU_SOURCE \ Index: Gui/win32/interface.c =================================================================== --- Gui/win32/interface.c (revision 19262) +++ Gui/win32/interface.c (working copy) @@ -26,11 +26,11 @@ #include #include #include -#include +#include #include #include #ifdef USE_DVDREAD -#include +#include #endif #include #include Index: Gui/win32/dialogs.c =================================================================== --- Gui/win32/dialogs.c (revision 19262) +++ Gui/win32/dialogs.c (working copy) @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include "gui.h" Index: Gui/win32/gui.c =================================================================== --- Gui/win32/gui.c (revision 19262) +++ Gui/win32/gui.c (working copy) @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include "gui.h" Index: Gui/mplayer/pb.c =================================================================== --- Gui/mplayer/pb.c (revision 19262) +++ Gui/mplayer/pb.c (working copy) @@ -17,7 +17,7 @@ #include "../libvo/x11_common.h" #include "../libvo/fastmemcpy.h" -#include "../libmpdemux/stream.h" +#include "../libstream/stream.h" #include "../mixer.h" #include "../libvo/sub.h" #include "../mplayer.h" Index: Gui/mplayer/mw.c =================================================================== --- Gui/mplayer/mw.c (revision 19262) +++ Gui/mplayer/mw.c (working copy) @@ -17,7 +17,7 @@ #include "../libvo/x11_common.h" #include "../libvo/fastmemcpy.h" -#include "../libmpdemux/stream.h" +#include "../libstream/stream.h" #include "../mixer.h" #include "../libvo/sub.h" #include "../mplayer.h" Index: Gui/mplayer/gtk/menu.c =================================================================== --- Gui/mplayer/gtk/menu.c (revision 19262) +++ Gui/mplayer/gtk/menu.c (working copy) @@ -14,7 +14,7 @@ #include "../widgets.h" #include "app.h" -#include "../../libmpdemux/stream.h" +#include "../../libstream/stream.h" #include "../../libmpdemux/demuxer.h" #include "../pixmaps/ab.xpm" Index: Gui/mplayer/gtk/fs.c =================================================================== --- Gui/mplayer/gtk/fs.c (revision 19262) +++ Gui/mplayer/gtk/fs.c (working copy) @@ -16,7 +16,7 @@ #include "../interface.h" #include "../../config.h" #include "../../help_mp.h" -#include "../../libmpdemux/stream.h" +#include "../../libstream/stream.h" #include "../widgets.h" #include "fs.h" Index: Gui/mplayer/play.c =================================================================== --- Gui/mplayer/play.c (revision 19262) +++ Gui/mplayer/play.c (working copy) @@ -28,7 +28,7 @@ #include "skin/skin.h" #include "skin/font.h" -#include "libmpdemux/stream.h" +#include "libstream/stream.h" extern float rel_seek_secs; extern int abs_seek_pos; Index: Gui/mplayer/common.c =================================================================== --- Gui/mplayer/common.c (revision 19262) +++ Gui/mplayer/common.c (working copy) @@ -17,7 +17,7 @@ #include "../libvo/x11_common.h" #include "../libvo/fastmemcpy.h" -#include "../libmpdemux/stream.h" +#include "../libstream/stream.h" #include "../mixer.h" #include "../libvo/sub.h" #include "../mplayer.h" Index: m_option.c =================================================================== --- m_option.c (revision 19262) +++ m_option.c (working copy) @@ -15,7 +15,7 @@ #include "m_option.h" //#include "m_config.h" #include "mp_msg.h" -#include "libmpdemux/url.h" +#include "libstream/url.h" // Don't free for 'production' atm #ifndef MP_DEBUG Index: Copyright =================================================================== --- Copyright (revision 19262) +++ Copyright (working copy) @@ -77,13 +77,13 @@ Name: dvbstream Version: 0.4.3-pre3 (cvs checkout) Homepage: http://www.linuxstb.org/dvbstream/ -Directory: libmpdemux +Directory: libstream License: GNU General Public License Name: realrtsp Version: xine CVS 2003/04/17 + patches Homepage: http://www.xinehq.de -Directory: libmpdemux/realrtsp/ +Directory: libstream/realrtsp/ License: GNU General Public License Name: id3edit @@ -113,5 +113,5 @@ Name: FreeSDP Version: 0.4.1 Homepage: https://savannah.nongnu.org/projects/freesdp/ -Directory: libmpdemux/freesdp/ +Directory: libstream/freesdp/ License: GNU General Public License Index: Makefile =================================================================== --- Makefile (revision 19262) +++ Makefile (working copy) @@ -105,6 +105,7 @@ $(W32_LIB) \ libaf/libaf.a \ libmpdemux/libmpdemux.a \ + libstream/libstream.a \ libswscale/libswscale.a \ osdep/libosdep.a \ $(DVDREAD_LIB) \ @@ -139,6 +140,7 @@ endif PARTS = libmpdemux \ + libstream \ libmpcodecs \ libavutil \ libavcodec \ @@ -195,6 +197,7 @@ COMMON_DEPS = $(W32_DEP) \ $(AV_DEP) \ libmpdemux/libmpdemux.a \ + libstream/libstream.a \ libmpcodecs/libmpcodecs.a \ libao2/libao2.a \ osdep/libosdep.a \ @@ -274,6 +277,9 @@ libmpdemux/libmpdemux.a: $(MAKE) -C libmpdemux +libstream/libstream.a: + $(MAKE) -C libstream + libmpcodecs/libmpcodecs.a: $(MAKE) -C libmpcodecs @@ -546,6 +552,7 @@ libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch]) libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch]) +libstream/libstream.a: $(wildcard libstream/*.[ch] libstream/*/*.[ch]) libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch]) libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch]) Index: libstream/Makefile =================================================================== --- libstream/Makefile (revision 0) +++ libstream/Makefile (revision 0) @@ -0,0 +1,160 @@ + +LIBNAME = libstream.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 $@ $< +.cpp.o: + $(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $< + +$(LIBNAME): $(OBJS) + $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) + +test: $(LIBNAME) test.c + $(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \ + ./libstream.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/*~ + +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 Index: asxparser.c =================================================================== --- asxparser.c (revision 19262) +++ asxparser.c (working copy) @@ -8,7 +8,7 @@ #include "playtree.h" #include "playtreeparser.h" -#include "libmpdemux/stream.h" +#include "libstream/stream.h" #include "libmpdemux/demuxer.h" #include "asxparser.h" #include "mp_msg.h" Index: mplayer.c =================================================================== --- mplayer.c (revision 19262) +++ mplayer.c (working copy) @@ -106,11 +106,11 @@ #endif /* HAVE_RTC */ #ifdef USE_TV -#include "libmpdemux/tv.h" +#include "libstream/tv.h" #endif #ifdef HAS_DVBIN_SUPPORT -#include "libmpdemux/dvbin.h" +#include "libstream/dvbin.h" static int last_dvb_step = 1; static int dvbin_reopen = 0; extern void cache_uninit(stream_t *s); @@ -175,14 +175,14 @@ static int max_framesize=0; -#include "libmpdemux/stream.h" +#include "libstream/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 "libstream/stream_dvd.h" #endif #include "libmpcodecs/dec_audio.h" Index: osdep/macosx_finder_args.c =================================================================== --- osdep/macosx_finder_args.c (revision 19262) +++ osdep/macosx_finder_args.c (working copy) @@ -1,6 +1,6 @@ #include #include -#include "libmpdemux/url.h" +#include "libstream/url.h" #include "mp_msg.h" #include "m_option.h" #include "m_config.h" Index: cfg-common.h =================================================================== --- cfg-common.h (revision 19262) +++ cfg-common.h (working copy) @@ -366,7 +366,7 @@ extern int ts_keep_broken; extern off_t ts_probe; -#include "libmpdemux/tv.h" +#include "libstream/tv.h" extern char* edl_filename; extern char* edl_output_filename; @@ -444,7 +444,7 @@ #endif #ifdef HAS_DVBIN_SUPPORT -#include "libmpdemux/dvbin.h" +#include "libstream/dvbin.h" extern m_config_t dvbin_opts_conf[]; #endif Index: playtreeparser.c =================================================================== --- playtreeparser.c (revision 19262) +++ playtreeparser.c (working copy) @@ -18,7 +18,7 @@ #include "m_config.h" #include "playtree.h" #include "playtreeparser.h" -#include "libmpdemux/stream.h" +#include "libstream/stream.h" #include "libmpdemux/demuxer.h" #include "mp_msg.h" Index: libmenu/menu.c =================================================================== --- libmenu/menu.c (revision 19262) +++ libmenu/menu.c (working copy) @@ -13,7 +13,7 @@ #include "libvo/font_load.h" #include "osdep/keycodes.h" #include "asxparser.h" -#include "libmpdemux/stream.h" +#include "libstream/stream.h" #include "img_format.h" #include "mp_image.h" Index: libmenu/menu_dvbin.c =================================================================== --- libmenu/menu_dvbin.c (revision 19262) +++ libmenu/menu_dvbin.c (working copy) @@ -24,7 +24,7 @@ #include "input/input.h" #include "osdep/keycodes.h" -#include "libmpdemux/dvbin.h" +#include "libstream/dvbin.h" Index: subreader.c =================================================================== --- subreader.c (revision 19262) +++ subreader.c (working copy) @@ -18,7 +18,7 @@ #include "config.h" #include "mp_msg.h" #include "subreader.h" -#include "libmpdemux/stream.h" +#include "libstream/stream.h" #ifdef HAVE_ENCA #include Index: TOOLS/Makefile =================================================================== --- TOOLS/Makefile (revision 19262) +++ TOOLS/Makefile (working copy) @@ -31,7 +31,7 @@ ../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 ../libstream/libstream.a fastmemcpybench: fastmemcpybench.c $(CC) $(CFLAGS) -g $< -o fastmem-mmx ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX Index: TOOLS/netstream/netstream.c =================================================================== --- TOOLS/netstream/netstream.c (revision 19262) +++ TOOLS/netstream/netstream.c (working copy) @@ -41,13 +41,13 @@ #include #endif -#include +#include #include #include #include /// Netstream packets def and some helpers -#include +#include //Set some standard variables Index: TOOLS/netstream/Makefile =================================================================== --- TOOLS/netstream/Makefile (revision 19262) +++ TOOLS/netstream/Makefile (working copy) @@ -19,6 +19,7 @@ # 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)/libstream/libstream.a \ $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \ $(MPROOT)/libmpcodecs/native/minilzo.o \ $(MPROOT)/libvo/aclib.o \ @@ -45,7 +46,7 @@ DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32 endif -netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o +netstream: $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdemux/libstream.a netstream.o $(CC) $(CFLAGS) netstream.o -o netstream $(DEPS) Index: libmpdemux/dvbin.c (deleted) =================================================================== Index: libmpdemux/cdinfo.c (deleted) =================================================================== Index: libmpdemux/dvbin.h (deleted) =================================================================== Index: libmpdemux/cache2.c (deleted) =================================================================== Index: libmpdemux/stream_dvd.c (deleted) =================================================================== Index: libmpdemux/network.c (deleted) =================================================================== Index: libmpdemux/pnm.c (deleted) =================================================================== Index: libmpdemux/stream_vstream.c (deleted) =================================================================== Index: libmpdemux/stream_dvd.h (deleted) =================================================================== Index: libmpdemux/network.h (deleted) =================================================================== Index: libmpdemux/stream_rtsp.c (deleted) =================================================================== Index: libmpdemux/rtp.c (deleted) =================================================================== Index: libmpdemux/rtp.h (deleted) =================================================================== Index: libmpdemux/vcd_read.h (deleted) =================================================================== Index: libmpdemux/ai_oss.c (deleted) =================================================================== Index: libmpdemux/ai_alsa.c (deleted) =================================================================== Index: libmpdemux/tv.c (deleted) =================================================================== Index: libmpdemux/tv.h (deleted) =================================================================== Index: libmpdemux/netstream.h (deleted) =================================================================== Index: libmpdemux/vcd_read_fbsd.h (deleted) =================================================================== Index: libmpdemux/asf_mmst_streaming.c (deleted) =================================================================== Index: libmpdemux/vcd_read_nbsd.h (deleted) =================================================================== Index: libmpdemux/stream_ftp.c (deleted) =================================================================== Index: libmpdemux/stream_null.c (deleted) =================================================================== Index: libmpdemux/cdda.c (deleted) =================================================================== Index: libmpdemux/cdd.h (deleted) =================================================================== Index: libmpdemux/mf.c (deleted) =================================================================== Index: libmpdemux/mf.h (deleted) =================================================================== Index: libmpdemux/http.c (deleted) =================================================================== Index: libmpdemux/stream_livedotcom.c (deleted) =================================================================== Index: libmpdemux/http.h (deleted) =================================================================== Index: libmpdemux/tvi_bsdbt848.c (deleted) =================================================================== Index: libmpdemux/stream_file.c (deleted) =================================================================== Index: libmpdemux/cookies.c (deleted) =================================================================== Index: libmpdemux/Makefile =================================================================== --- libmpdemux/Makefile (revision 19262) +++ libmpdemux/Makefile (working copy) @@ -12,89 +12,15 @@ # 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 @@ 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 \ +ifeq ($(MENCODER),yes) +SRCS += $(MUXERS) +endif -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 ($(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../libstream -I../loader $(LIBAV_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS CPLUSPLUS = $(CC) @@ -235,10 +131,7 @@ $(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 Index: libmpdemux/cookies.h (deleted) =================================================================== Index: libmpdemux/dvb_tune.c (deleted) =================================================================== Index: libmpdemux/cue_read.c (deleted) =================================================================== Index: libmpdemux/tvi_v4l2.c (deleted) =================================================================== Index: libmpdemux/realrtsp/sdpplin.h (deleted) =================================================================== Index: libmpdemux/realrtsp/rmff.h (deleted) =================================================================== Index: libmpdemux/realrtsp/xbuffer.c (deleted) =================================================================== Index: libmpdemux/realrtsp/asmrp.c (deleted) =================================================================== Index: libmpdemux/realrtsp/real.c (deleted) =================================================================== Index: libmpdemux/realrtsp/xbuffer.h (deleted) =================================================================== Index: libmpdemux/realrtsp/asmrp.h (deleted) =================================================================== Index: libmpdemux/realrtsp/real.h (deleted) =================================================================== Index: libmpdemux/realrtsp/sdpplin.c (deleted) =================================================================== Index: libmpdemux/realrtsp/rmff.c (deleted) =================================================================== Index: libmpdemux/cue_read.h (deleted) =================================================================== Index: libmpdemux/stream_pvr.c (deleted) =================================================================== Index: libmpdemux/audio_in.c (deleted) =================================================================== Index: libmpdemux/stream_smb.c (deleted) =================================================================== Index: libmpdemux/cddb.c (deleted) =================================================================== Index: libmpdemux/audio_in.h (deleted) =================================================================== Index: libmpdemux/dvdnav_stream.c (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp_session.h (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp_rtp.h (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp.c (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp_session.c (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp.h (deleted) =================================================================== Index: libmpdemux/librtsp/rtsp_rtp.c (deleted) =================================================================== Index: libmpdemux/open.c (deleted) =================================================================== Index: libmpdemux/dvdnav_stream.h (deleted) =================================================================== Index: libmpdemux/ai_alsa1x.c (deleted) =================================================================== Index: libmpdemux/stream_netstream.c (deleted) =================================================================== Index: libmpdemux/tvi_dummy.c (deleted) =================================================================== Index: libmpdemux/stream.c (deleted) =================================================================== Index: libmpdemux/stream.h (deleted) =================================================================== Index: libmpdemux/url.c (deleted) =================================================================== Index: libmpdemux/url.h (deleted) =================================================================== Index: libmpdemux/frequencies.c (deleted) =================================================================== Index: libmpdemux/vcd_read_darwin.h (deleted) =================================================================== Index: libmpdemux/asf_streaming.c (deleted) =================================================================== Index: libmpdemux/tvi_def.h (deleted) =================================================================== Index: libmpdemux/stream_vcd.c (deleted) =================================================================== Index: libmpdemux/tvi_v4l.c (deleted) =================================================================== Index: mencoder.c =================================================================== --- mencoder.c (revision 19262) +++ mencoder.c (working copy) @@ -48,7 +48,7 @@ #include "m_config.h" #include "parser-mecmd.h" -#include "libmpdemux/stream.h" +#include "libstream/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 "libstream/stream_dvd.h" #endif #ifdef USE_LIBAVCODEC