diff options
-rw-r--r-- | stream/stream_radio.c | 3 | ||||
-rw-r--r-- | stream/tv.c | 2 | ||||
-rw-r--r-- | stream/tv.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 2a3e36d515..441dff367c 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -1071,10 +1071,11 @@ char* radio_get_channel_name(struct stream_st *stream){ * \return number of bytes, written into buffer */ static int fill_buffer_s(struct stream_st *s, char* buffer, int max_len){ - radio_priv_t* priv=(radio_priv_t*)s->priv; int len=max_len; #ifdef USE_RADIO_CAPTURE + radio_priv_t* priv=(radio_priv_t*)s->priv; + if (priv->do_capture){ len=grab_audio_frame(priv, buffer,max_len); } diff --git a/stream/tv.c b/stream/tv.c index a3fbaeeb02..dcb96f1126 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -19,7 +19,6 @@ #include "config.h" -int tv_param_on = 0; #include "mp_msg.h" #include "help_mp.h" @@ -668,7 +667,6 @@ static void demux_close_tv(demuxer_t *demuxer) tvi_handle_t *tv_begin(void) { int i; - tvi_info_t* info; tvi_handle_t* h; if(!strcmp(tv_param_driver,"help")){ mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_AvailableDrivers); diff --git a/stream/tv.h b/stream/tv.h index 4335605ae8..942060b37a 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -1,8 +1,6 @@ #ifndef TV_H #define TV_H -extern int tv_param_on; - #ifdef USE_TV //#include "libao2/afmt.h" //#include "libmpcodecs/img_format.h" |