From 423c415534f7393c07247b87ab4d95f6d0635474 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 7 Nov 2009 12:31:05 +0000 Subject: Separate teletext from tv support. Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_dshow.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'stream/tvi_dshow.c') diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 28bf0a141f..40951a698e 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -2552,7 +2552,7 @@ static HRESULT build_vbi_chain(priv_t *priv) if(priv->chains[2]->rbuf) return S_OK; - if(priv->tv_param->tdevice) + if(priv->tv_param->teletext.device) { priv->chains[2]->rbuf=calloc(1,sizeof(grabber_ringbuffer_t)); if(!priv->chains[2]->rbuf) @@ -3493,8 +3493,9 @@ static int control(priv_t * priv, int cmd, void *arg) priv->priv_vbi=NULL; return TVI_CONTROL_TRUE; } - default: - return teletext_control(priv->priv_vbi,cmd,arg); + case TVI_CONTROL_GET_VBI_PTR: + *(void **)arg=priv->priv_vbi; + return TVI_CONTROL_TRUE; #endif } return TVI_CONTROL_UNKNOWN; -- cgit v1.2.3