Alex Villacís Lasso : quartz: Skip over INFO chunk in AVI file parsing.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Aug 26 13:47:34 CDT 2006


Module: wine
Branch: master
Commit: bc06d70770171d6120e240e6572b8526d55381dd
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=bc06d70770171d6120e240e6572b8526d55381dd

Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date:   Fri Aug 25 13:43:59 2006 -0500

quartz: Skip over INFO chunk in AVI file parsing.

---

 dlls/quartz/avisplit.c |    2 +-
 dlls/quartz/fourcc.h   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index 480a7d3..f1eff89 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -550,7 +550,7 @@ static HRESULT AVISplitter_InputPin_PreC
     pos += sizeof(RIFFCHUNK) + list.cb;
     hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list);
 
-    if (list.fcc == ckidJUNK)
+    while (list.fcc == ckidJUNK || (list.fcc == ckidLIST && list.fccListType == ckidINFO))
     {
         pos += sizeof(RIFFCHUNK) + list.cb;
         hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list);
diff --git a/dlls/quartz/fourcc.h b/dlls/quartz/fourcc.h
index a21910c..317b432 100644
--- a/dlls/quartz/fourcc.h
+++ b/dlls/quartz/fourcc.h
@@ -34,6 +34,7 @@ #define ckidAVI               aviFCC('A'
 #define ckidRIFF              aviFCC('R','I','F','F')
 #define ckidLIST              aviFCC('L','I','S','T')
 #define ckidJUNK              aviFCC('J','U','N','K')
+#define ckidINFO              aviFCC('I','N','F','O')
 #define ckidHEADERLIST        aviFCC('h','d','r','l')
 #define ckidAVIMOVIE          aviFCC('m','o','v','i')
 #define ckidSTREAMNAME        aviFCC('s','t','r','n')




More information about the wine-cvs mailing list