ckidJUNK is a FOURCC not a TWOCC so rewrite the case statement

appropriately.
This commit is contained in:
Robert Shearman 2004-07-22 23:44:39 +00:00 committed by Alexandre Julliard
parent 383e06d82c
commit 0b20ab1806
1 changed files with 21 additions and 17 deletions

View File

@ -549,6 +549,14 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
else else
offset_src = 0; offset_src = 0;
switch (This->CurrentChunk.fcc)
{
case ckidJUNK:
/* silently ignore */
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream))
bMoreData = FALSE;
continue;
default:
switch (TWOCCFromFOURCC(This->CurrentChunk.fcc)) switch (TWOCCFromFOURCC(This->CurrentChunk.fcc))
{ {
case cktypeDIBcompressed: case cktypeDIBcompressed:
@ -563,17 +571,13 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
case cktypePALchange: case cktypePALchange:
FIXME("handle palette change\n"); FIXME("handle palette change\n");
break; break;
case ckidJUNK:
/* silently ignore */
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream))
bMoreData = FALSE;
continue;
default: default:
FIXME("Skipping unknown chunk type: %s at file offset 0x%lx\n", debugstr_an((LPSTR)&This->CurrentChunk.fcc, 4), (DWORD)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset)); FIXME("Skipping unknown chunk type: %s at file offset 0x%lx\n", debugstr_an((LPSTR)&This->CurrentChunk.fcc, 4), (DWORD)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset));
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream)) if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream))
bMoreData = FALSE; bMoreData = FALSE;
continue; continue;
} }
}
streamId = StreamFromFOURCC(This->CurrentChunk.fcc); streamId = StreamFromFOURCC(This->CurrentChunk.fcc);