diff options
| author | johndoe123 | 2014-01-30 20:18:55 +0100 |
|---|---|---|
| committer | johndoe123 | 2014-01-30 20:18:55 +0100 |
| commit | cf51529cfd0fedb33b1b0c70beb59997b21cfc5b (patch) | |
| tree | 1df30e23c7f1eac7ca4a8ddfba40c89c2577dda7 /common/quicktime.cpp | |
| parent | 542197a891eac799855571fe2849e0dca43bdd2b (diff) | |
| parent | 462f7c1c24a48b7555316a3afae357bad14cc14b (diff) | |
| download | scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.gz scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.bz2 scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.zip | |
Merge remote-tracking branch 'origin/master' into bbvs
Diffstat (limited to 'common/quicktime.cpp')
| -rw-r--r-- | common/quicktime.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/quicktime.cpp b/common/quicktime.cpp index a3efc2b443..6ab5a42b89 100644 --- a/common/quicktime.cpp +++ b/common/quicktime.cpp @@ -368,9 +368,6 @@ int QuickTimeParser::readMVHD(Atom atom) { int QuickTimeParser::readTRAK(Atom atom) { Track *track = new Track(); - if (!track) - return -1; - track->codecType = CODEC_TYPE_MOV_OTHER; track->startTime = 0; // XXX: check _tracks.push_back(track); |