From cb25b7b5eea53769fc378dc8ae3d360eca685e74 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Fri, 16 Jan 2015 02:11:20 -0500 Subject: [PATCH] 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 --- video/qt_decoder.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 08d7620fb25..9b77ef70c10 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;