diff options
| author | Matthew Hoops | 2012-07-21 17:30:43 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-21 17:30:43 -0400 |
| commit | 5cdb0f71a499250d36d79d0f8ba85ff2d370f9aa (patch) | |
| tree | def7f63175a13bb775d858b553592aea7172dc5b /video | |
| parent | fc1163ac28aae1c7bc9f8f9d3877c6f368b4b19c (diff) | |
| download | scummvm-rg350-5cdb0f71a499250d36d79d0f8ba85ff2d370f9aa.tar.gz scummvm-rg350-5cdb0f71a499250d36d79d0f8ba85ff2d370f9aa.tar.bz2 scummvm-rg350-5cdb0f71a499250d36d79d0f8ba85ff2d370f9aa.zip | |
VIDEO: Fix AudioTrack::endOfTrack()
Diffstat (limited to 'video')
| -rw-r--r-- | video/video_decoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index 3312b2530d..82cba7e6e2 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -414,7 +414,7 @@ Audio::Timestamp AdvancedVideoDecoder::FixedDurationVideoTrack::getDuration() co bool AdvancedVideoDecoder::AudioTrack::endOfTrack() const { Audio::AudioStream *stream = getAudioStream(); - return !stream || (!g_system->getMixer()->isSoundHandleActive(_handle) && stream->endOfData()); + return !stream || !g_system->getMixer()->isSoundHandleActive(_handle) || stream->endOfData(); } void AdvancedVideoDecoder::AudioTrack::setVolume(byte volume) { |