diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /stream/stream.c | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'stream/stream.c')
-rw-r--r-- | stream/stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/stream/stream.c b/stream/stream.c index be41c29959..af43b6da69 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -90,10 +90,10 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef HAS_DVBIN_SUPPORT &stream_info_dvb, #endif -#ifdef USE_TV +#ifdef CONFIG_TV &stream_info_tv, #endif -#ifdef USE_RADIO +#ifdef CONFIG_RADIO &stream_info_radio, #endif #ifdef HAVE_PVR @@ -109,11 +109,11 @@ static const stream_info_t* const auto_open_streams[] = { &stream_info_smb, #endif &stream_info_cue, -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD &stream_info_ifo, &stream_info_dvd, #endif -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV &stream_info_dvdnav, #endif @@ -379,7 +379,7 @@ void stream_reset(stream_t *s){ int stream_control(stream_t *s, int cmd, void *arg){ if(!s->control) return STREAM_UNSUPPORTED; -#ifdef USE_STREAM_CACHE +#ifdef CONFIG_STREAM_CACHE if (s->cache_pid) return cache_do_control(s, cmd, arg); #endif @@ -429,7 +429,7 @@ stream_t* new_stream(int fd,int type){ void free_stream(stream_t *s){ // printf("\n*** free_stream() called ***\n"); -#ifdef USE_STREAM_CACHE +#ifdef CONFIG_STREAM_CACHE if(s->cache_pid) { cache_uninit(s); } |