RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 08:16:50 +00:00
Code Issues Releases Wiki Activity

Make sure that mplayer will receive actual media type

Browse Source 
instead of requested value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25057 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-11-16 18:59:35 +00:00
parent b4355b2f1d
commit 13df91222f
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stream/tvi_dshow.c
View File

@ -1307,6 +1307,8 @@ static HRESULT build_sub_graph(priv_t * priv, IBaseFilter * pCaptureFilter,
{
HRESULT hr;
AM_MEDIA_TYPE conn_mt; //Media type of established connection
IPin *pSGIn;
IPin *pSGOut;
IPin *pNRIn=NULL;
@ -1396,6 +1398,12 @@ static HRESULT build_sub_graph(priv_t * priv, IBaseFilter * pCaptureFilter,
mp_msg(MSGT_TV,MSGL_DBG2,"tvi_dshow: Unable to create pCapturePin<->pSGIn connection. Error:0x%x\n", (unsigned int)hr);
break;
}
hr = OLE_CALL_ARGS(pCapturePin, ConnectionMediaType, &conn_mt);
if(FAILED(hr))
{
mp_msg(MSGT_TV, MSGL_WARN, MSGTR_TVI_DS_GetActualMediatypeFailed, (unsigned int)hr);
CopyMediaType(&conn_mt, pmt);
}
if(priv->tv_param->hidden_video_renderer){
IEnumFilters* pEnum;
@ -1449,6 +1457,11 @@ static HRESULT build_sub_graph(priv_t * priv, IBaseFilter * pCaptureFilter,
hr = S_OK;
} while(0);
FreeMediaType(pmt);
CopyMediaType(pmt, &conn_mt);
FreeMediaType(&conn_mt);
OLE_RELEASE_SAFE(pSGF);
OLE_RELEASE_SAFE(pSGIn);
OLE_RELEASE_SAFE(pSGOut);