github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Code Releases Activity

Revert r25089 (Ignore video formats which are supported by device

Browse Source 
but not supported by dshow driver).

It prevents code from r25091 (probing undeclared formats) functioning
properly: those code is never called if all declared by device formats
are unsupported by MPlayer (even if undeclared one is supported).

After this revert PVR-150 card should work as expected.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25155 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-11-24 07:51:31 +00:00
parent d0fa6cd8c8
commit e4e63d7a04
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stream/tvi_dshow.c
View File

@ -2067,29 +2067,18 @@ static HRESULT get_available_formats_stream(chain_t *chain)
pBuf = (void **) malloc((count + 1) * sizeof(void *));
if (pBuf) {
int dst = 0;
memset(pBuf, 0, (count + 1) * sizeof(void *));
for (i = 0; i < count; i++) {
pBuf[dst] = malloc(size);
pBuf[i] = malloc(size);
if (!pBuf[dst])
if (!pBuf[i])
break;
hr = OLE_CALL_ARGS(chain->pStreamConfig, GetStreamCaps, i,
&(arpmt[dst]), pBuf[dst]);
&(arpmt[i]), pBuf[i]);
if (FAILED(hr))
break;
if(!memcmp(&(arpmt[dst]->majortype), &MEDIATYPE_Video, 16) && !subtype2imgfmt(&(arpmt[dst]->subtype)))
{
DisplayMediaType("Skipping unsupported video format", arpmt[dst]);
DeleteMediaType(arpmt[dst]);
free(pBuf[dst]);
arpmt[dst]=NULL;
pBuf[dst]=NULL;
continue;
}
dst++;
}
if (i == count) {
chain->arpmt = arpmt;