diff options
Diffstat (limited to 'stream/tv.c')
-rw-r--r-- | stream/tv.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/stream/tv.c b/stream/tv.c index 3ce7264691..9ca0c72dcc 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -43,7 +43,6 @@ #include "libaf/af_format.h" #include "libmpcodecs/img_format.h" -#include "libmpcodecs/dec_teletext.h" #include "libavutil/avstring.h" #include "osdep/timer.h" @@ -380,8 +379,6 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm) mp_tmsg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); return 0; } - teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, - &tvh->tv_param->teletext); return 1; } @@ -395,8 +392,6 @@ static int tv_set_norm_i(tvi_handle_t *tvh, int norm) return 0; } - teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, - &tvh->tv_param->teletext); return 1; } @@ -705,10 +700,6 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer) if (!tvh->functions->init(tvh->priv)) return NULL; tvh->demuxer = demuxer; - tvh->functions->control(tvh->priv,TVI_CONTROL_VBI_INIT, - &(tvh->tv_param->teletext.device)); - tvh->functions->control(tvh->priv,TVI_CONTROL_GET_VBI_PTR, - &demuxer->teletext); if (!open_tv(tvh)){ tv_uninit(tvh); @@ -850,9 +841,6 @@ no_audio: if(funcs->control(tvh->priv,TVI_CONTROL_VID_SET_GAIN,&tvh->tv_param->gain)!=TVI_CONTROL_TRUE) mp_msg(MSGT_TV,MSGL_WARN,"Unable to set gain control!\n"); - teletext_control(demuxer->teletext,TV_VBI_CONTROL_RESET, - &tvh->tv_param->teletext); - return demuxer; } @@ -863,7 +851,6 @@ static void demux_close_tv(demuxer_t *demuxer) tv_uninit(tvh); free(tvh); demuxer->priv=NULL; - demuxer->teletext=NULL; } int tv_set_color_options(tvi_handle_t *tvh, int opt, int value) @@ -932,8 +919,6 @@ int tv_set_freq(tvi_handle_t *tvh, unsigned long freq) mp_tmsg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", freq, (float)freq/16); } - teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, - &tvh->tv_param->teletext); return 1; } @@ -1114,8 +1099,6 @@ int tv_step_norm(tvi_handle_t *tvh) return 0; } } - teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, - &tvh->tv_param->teletext); return 1; } |