summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-24 07:51:31 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-24 07:51:31 +0000
commite4e63d7a040e853cdc26f368054eb10a62b64fe9 (patch)
tree26348bb052c752ad1ecd74f264d96bc95c86bbf5
parentd0fa6cd8c83b91edf5ad516384d1575f77008416 (diff)
downloadmpv-e4e63d7a040e853cdc26f368054eb10a62b64fe9.tar.bz2
mpv-e4e63d7a040e853cdc26f368054eb10a62b64fe9.tar.xz
Revert r25089 (Ignore video formats which are supported by device
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
-rw-r--r--stream/tvi_dshow.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c
index 7f2a1a719e..e158048411 100644
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@@ -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;