diff options
author | Matthew Hoops | 2015-01-16 02:11:20 -0500 |
---|---|---|
committer | Matthew Hoops | 2015-01-20 20:10:59 -0500 |
commit | cb25b7b5eea53769fc378dc8ae3d360eca685e74 (patch) | |
tree | ae7ad3dae00e811f5dd31db8869587fbf9ee38b5 /video/qt_decoder.cpp | |
parent | 7d1ee5563a7168843b9f6400010ddd9983abebbc (diff) | |
download | scummvm-rg350-cb25b7b5eea53769fc378dc8ae3d360eca685e74.tar.gz scummvm-rg350-cb25b7b5eea53769fc378dc8ae3d360eca685e74.tar.bz2 scummvm-rg350-cb25b7b5eea53769fc378dc8ae3d360eca685e74.zip |
VIDEO: Make the QuickTime code error out again if the frame data can't be found
The case shouldn't actually ever happen; the off-by-one bug when seeking to the last frame of the media (in an edit) caused this originally
Diffstat (limited to 'video/qt_decoder.cpp')
-rw-r--r-- | video/qt_decoder.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 08d7620fb2..9b77ef70c1 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -566,10 +566,8 @@ Common::SeekableReadStream *QuickTimeDecoder::VideoTrackHandler::getNextFramePac } } - if (actualChunk < 0) { - warning("Could not find data for frame %d", _curFrame); - return 0; - } + if (actualChunk < 0) + error("Could not find data for frame %d", _curFrame); // Next seek to that frame Common::SeekableReadStream *stream = _decoder->_fd; |