RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Code unification: get rid of local variable arpmtVBI 

and use chain structure's arpmt member.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25109 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-11-19 19:15:36 +00:00
parent 2f8d411130
commit 8e2f39307a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stream/tvi_dshow.c
View File

@ -2518,7 +2518,6 @@ static HRESULT build_vbi_chain(priv_t *priv)
{
#ifdef HAVE_TV_TELETEXT
HRESULT hr;
AM_MEDIA_TYPE* arpmtVBI[2] = { priv->chains[2]->pmt, NULL };
if(priv->chains[2]->rbuf)
return S_OK;
@ -2531,9 +2530,7 @@ static HRESULT build_vbi_chain(priv_t *priv)
init_ringbuffer(priv->chains[2]->rbuf,24,priv->tsp.bufsize);
priv->chains[2]->pmt=calloc(1,sizeof(AM_MEDIA_TYPE));
priv->chains[2]->pmt->majortype=MEDIATYPE_VBI;
hr=build_sub_graph(priv, priv->chains[0]->pCaptureFilter, priv->chains[2]->rbuf,arpmtVBI,NULL,&PIN_CATEGORY_VBI);
hr=build_sub_graph(priv, priv->chains[0]->pCaptureFilter, priv->chains[2]->rbuf,priv->chains[2]->arpmt,NULL,&PIN_CATEGORY_VBI);
if(FAILED(hr)){
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TVI_DS_UnableBuildVBISubGraph,(unsigned int)hr);
return 0;
@ -2798,6 +2795,16 @@ static int init(priv_t * priv)
priv->chains[1]->pStreamConfig = NULL;
}
}
/*
Getting formats for VBI stream
*/
priv->chains[2]->nFormatUsed = 0;
priv->chains[2]->arpmt = calloc(2, sizeof(AM_MEDIA_TYPE*));
priv->chains[2]->arpmt[0] = calloc(1, sizeof(AM_MEDIA_TYPE));
priv->chains[2]->arpmt[0]->majortype = MEDIATYPE_VBI;
priv->chains[2]->pmt = CreateMediaType(priv->chains[2]->arpmt[priv->chains[2]->nFormatUsed]);
/* debug */
{
int i;