diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /stream/stream.c | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'stream/stream.c')
-rw-r--r-- | stream/stream.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/stream/stream.c b/stream/stream.c index af43b6da69..47d55be71f 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -67,19 +67,19 @@ extern const stream_info_t stream_info_ifo; extern const stream_info_t stream_info_dvd; static const stream_info_t* const auto_open_streams[] = { -#ifdef HAVE_VCD +#ifdef CONFIG_VCD &stream_info_vcd, #endif -#ifdef HAVE_CDDA +#ifdef CONFIG_CDDA &stream_info_cdda, #endif -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK &stream_info_netstream, &stream_info_http1, &stream_info_asf, &stream_info_pnm, &stream_info_rtsp, -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 &stream_info_sdp, &stream_info_rtsp_sip, #endif @@ -87,7 +87,7 @@ static const stream_info_t* const auto_open_streams[] = { &stream_info_udp, &stream_info_http2, #endif -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN &stream_info_dvb, #endif #ifdef CONFIG_TV @@ -96,16 +96,16 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_RADIO &stream_info_radio, #endif -#ifdef HAVE_PVR +#ifdef CONFIG_PVR &stream_info_pvr, #endif -#ifdef HAVE_FTP +#ifdef CONFIG_FTP &stream_info_ftp, #endif -#ifdef HAVE_VSTREAM +#ifdef CONFIG_VSTREAM &stream_info_vstream, #endif -#ifdef LIBSMBCLIENT +#ifdef CONFIG_LIBSMBCLIENT &stream_info_smb, #endif &stream_info_cue, @@ -151,7 +151,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename, s->flags |= mode; *ret = sinfo->open(s,mode,arg,file_format); if((*ret) != STREAM_OK) { -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if (*ret == STREAM_REDIRECTED && redirected_url) { if (s->streaming_ctrl && s->streaming_ctrl->url && s->streaming_ctrl->url->url) @@ -245,7 +245,7 @@ int stream_fill_buffer(stream_t *s){ if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } switch(s->type){ case STREAMTYPE_STREAM: -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; } else { @@ -312,7 +312,7 @@ if(newpos==0 || newpos!=s->pos){ // Some streaming protocol allow to seek backward and forward // A function call that return -1 can tell that the protocol // doesn't support seeking. -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one if(!s->seek(s,newpos)) { mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); |