diff options
author | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-27 04:25:12 +0000 |
---|---|---|
committer | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-27 04:25:12 +0000 |
commit | 81cbdce6aa3597074c9ad33c22d85e8124374fb5 (patch) | |
tree | 7bc0de43e003d33bc1644f8bcc0686188f9e3980 /libmpdemux | |
parent | e80d264f49ee0ae1398fbfcc81cfc94272e2923e (diff) | |
download | mpv-81cbdce6aa3597074c9ad33c22d85e8124374fb5.tar.bz2 mpv-81cbdce6aa3597074c9ad33c22d85e8124374fb5.tar.xz |
added a stream module for the vstream client library
allows MPlayer to stream video from a properly equipped Tivo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14837 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 2 | ||||
-rw-r--r-- | libmpdemux/open.c | 2 | ||||
-rw-r--r-- | libmpdemux/stream.c | 6 | ||||
-rw-r--r-- | libmpdemux/stream.h | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 042404d01f..de90167311 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -3,7 +3,7 @@ LIBNAME = libmpdemux.a include ../config.mak -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c demux_vqf.c +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c stream_vstream.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c demux_vqf.c ifeq ($(XMMS_PLUGINS),yes) SRCS += demux_xmms.c endif diff --git a/libmpdemux/open.c b/libmpdemux/open.c index dfbde8c877..2222f3addc 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -496,7 +496,7 @@ if(strncmp("dvd://",filename,6) == 0){ if (strncmp("tv://", filename, 5) && strncmp("mf://", filename, 5) && strncmp("vcd://", filename, 6) && strncmp("dvb://", filename, 6) && strncmp("cdda://", filename, 7) && strncmp("cddb://", filename, 7) && - strncmp("mpst://", filename, 7) && + strncmp("mpst://", filename, 7) && strncmp("tivo://", filename, 7) && strstr(filename, "://")) { url = url_new(filename); } diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index cf211d38ac..60e174bb9c 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -64,6 +64,9 @@ extern stream_info_t stream_info_dvb; #ifdef HAVE_FTP extern stream_info_t stream_info_ftp; #endif +#ifdef HAVE_VSTREAM +extern stream_info_t stream_info_vstream; +#endif extern stream_info_t stream_info_null; extern stream_info_t stream_info_file; @@ -84,6 +87,9 @@ stream_info_t* auto_open_streams[] = { #ifdef HAVE_FTP &stream_info_ftp, #endif +#ifdef HAVE_VSTREAM + &stream_info_vstream, +#endif &stream_info_null, &stream_info_file, NULL diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index a9f9241d76..4ada0fb9d5 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -19,6 +19,7 @@ #define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba) #define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files #define STREAMTYPE_DVB 13 +#define STREAMTYPE_VSTREAM 14 #define STREAM_BUFFER_SIZE 2048 |