diff options
| author | Matthew Hoops | 2012-07-26 23:20:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-26 23:20:25 -0400 |
| commit | af6e98ba0108fc87c5aea2e85a1aef80443937b5 (patch) | |
| tree | 5547896dfd9d4d4c55895ea4638bc12c60ce66c7 | |
| parent | 57a06e383b7c3c950653a99c81c1c7fd7dcd5b1d (diff) | |
| download | scummvm-rg350-af6e98ba0108fc87c5aea2e85a1aef80443937b5.tar.gz scummvm-rg350-af6e98ba0108fc87c5aea2e85a1aef80443937b5.tar.bz2 scummvm-rg350-af6e98ba0108fc87c5aea2e85a1aef80443937b5.zip | |
VIDEO: Ignore finished video tracks in findNextVideoTrack()
| -rw-r--r-- | video/video_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index 8b9a009b98..9282cd82d0 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -575,7 +575,7 @@ AdvancedVideoDecoder::VideoTrack *AdvancedVideoDecoder::findNextVideoTrack() { uint32 bestTime = 0xFFFFFFFF; for (TrackList::iterator it = _tracks.begin(); it != _tracks.end(); it++) { - if ((*it)->getTrackType() == Track::kTrackTypeVideo) { + if ((*it)->getTrackType() == Track::kTrackTypeVideo && !(*it)->endOfTrack()) { VideoTrack *track = (VideoTrack *)*it; uint32 time = track->getNextFrameStartTime(); @@ -594,7 +594,7 @@ const AdvancedVideoDecoder::VideoTrack *AdvancedVideoDecoder::findNextVideoTrack uint32 bestTime = 0xFFFFFFFF; for (TrackList::const_iterator it = _tracks.begin(); it != _tracks.end(); it++) { - if ((*it)->getTrackType() == Track::kTrackTypeVideo) { + if ((*it)->getTrackType() == Track::kTrackTypeVideo && !(*it)->endOfTrack()) { const VideoTrack *track = (const VideoTrack *)*it; uint32 time = track->getNextFrameStartTime(); |