aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2012-02-27 18:31:20 -0500
committerMatthew Hoops2012-02-27 18:31:20 -0500
commitf17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7 (patch)
treeaf836e6415be0dd8d868ea86815b3a2f25ddf2de
parentdfdfc2f29739359bebb02df63e84b9b5f87c0058 (diff)
downloadscummvm-rg350-f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7.tar.gz
scummvm-rg350-f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7.tar.bz2
scummvm-rg350-f17b1bf4f09c14d18a7bd2c5b0eeb2ac2f4490f7.zip
COMMON: Fix opening QuickTime files from MacBinary files
-rw-r--r--common/quicktime.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/common/quicktime.cpp b/common/quicktime.cpp
index dbec7f7b90..248d8b2b3a 100644
--- a/common/quicktime.cpp
+++ b/common/quicktime.cpp
@@ -66,7 +66,7 @@ bool QuickTimeParser::parseFile(const String &filename) {
_foundMOOV = false;
_disposeFileHandle = DisposeAfterUse::YES;
- Atom atom = { 0, 0, 0xffffffff };
+ Atom atom = { 0, 0, 0 };
if (_resFork->hasResFork()) {
// Search for a 'moov' resource
@@ -80,14 +80,12 @@ bool QuickTimeParser::parseFile(const String &filename) {
if (readDefault(atom) < 0 || !_foundMOOV)
return false;
}
- delete _fd;
- atom.type = 0;
- atom.offset = 0;
- atom.size = 0xffffffff;
+ delete _fd;
}
_fd = _resFork->getDataFork();
+ atom.size = _fd->size();
if (readDefault(atom) < 0 || !_foundMOOV)
return false;