aboutsummaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
authorFilippos Karapetis2014-01-05 15:26:38 +0200
committerFilippos Karapetis2014-01-05 15:34:33 +0200
commit1632d5f39a577b5fe1f6a6d89bd67896dbc54673 (patch)
treecf12931592f6993129c28572c521489747cbbe01 /video
parent52ec63441535c6207fed95964d99347fc51f5541 (diff)
downloadscummvm-rg350-1632d5f39a577b5fe1f6a6d89bd67896dbc54673.tar.gz
scummvm-rg350-1632d5f39a577b5fe1f6a6d89bd67896dbc54673.tar.bz2
scummvm-rg350-1632d5f39a577b5fe1f6a6d89bd67896dbc54673.zip
VIDEO: Handle the AVI 'JUNQ' and 'dmlh' chunk headers
These are used by Full Pipe's intro videos
Diffstat (limited to 'video')
-rw-r--r--video/avi_decoder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 36fe83fa19..7f5a557474 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -59,6 +59,8 @@ namespace Video {
#define ID_MIDS MKTAG('m','i','d','s')
#define ID_TXTS MKTAG('t','x','t','s')
#define ID_JUNK MKTAG('J','U','N','K')
+#define ID_JUNQ MKTAG('J','U','N','Q')
+#define ID_DMLH MKTAG('d','m','l','h')
#define ID_STRF MKTAG('s','t','r','f')
#define ID_MOVI MKTAG('m','o','v','i')
#define ID_REC MKTAG('r','e','c',' ')
@@ -155,9 +157,11 @@ bool AVIDecoder::parseNextChunk() {
case ID_STRD: // Extra stream info, safe to ignore
case ID_VEDT: // Unknown, safe to ignore
case ID_JUNK: // Alignment bytes, should be ignored
+ case ID_JUNQ: // Same as JUNK, safe to ignore
case ID_ISFT: // Metadata, safe to ignore
case ID_DISP: // Metadata, should be safe to ignore
case ID_STRN: // Metadata, safe to ignore
+ case ID_DMLH: // OpenDML extension, contains an extra total frames field, safe to ignore
skipChunk(size);
break;
case ID_IDX1: