Mercurial > mplayer.hg

changeset 25127:6e039dd0b5d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author voroshil
date Sat, 24 Nov 2007 07:51:31 +0000
parents 8152446e42b1
children b3aa123be8f5
files stream/tvi_dshow.c
diffstat 1 files changed, 4 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/stream/tvi_dshow.c	Sat Nov 24 07:28:05 2007 +0000
+++ b/stream/tvi_dshow.c	Sat Nov 24 07:51:31 2007 +0000
@@ -2067,29 +2067,18 @@
 
 	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);
-
-		if (!pBuf[dst])
+		pBuf[i] = malloc(size);
+
+		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;