diff options
| author | Matthew Hoops | 2012-08-26 12:38:35 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-26 12:38:35 -0400 |
| commit | 6f9d84665fd090ae55386b1373a69e080b34e089 (patch) | |
| tree | 871171da7f52b8129408cf59dd2faa78c4937042 /video | |
| parent | c7222ed5a4428c51cdf325fc0eb172f46a991d86 (diff) | |
| download | scummvm-rg350-6f9d84665fd090ae55386b1373a69e080b34e089.tar.gz scummvm-rg350-6f9d84665fd090ae55386b1373a69e080b34e089.tar.bz2 scummvm-rg350-6f9d84665fd090ae55386b1373a69e080b34e089.zip | |
COMMON: Add MKTAG16 for 16-bit multi-character constants
Diffstat (limited to 'video')
| -rw-r--r-- | video/avi_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 0850d5656a..09b95d38ad 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -334,14 +334,14 @@ void AVIDecoder::readNextPacket() { _fileStream->skip(chunkSize & 1); if (track->getTrackType() == Track::kTrackTypeAudio) { - if (getStreamType(nextTag) != 'wb') + if (getStreamType(nextTag) != MKTAG16('w', 'b')) error("Invalid audio track tag '%s'", tag2str(nextTag)); ((AVIAudioTrack *)track)->queueSound(chunk); } else { AVIVideoTrack *videoTrack = (AVIVideoTrack *)track; - if (getStreamType(nextTag) == 'pc') { + if (getStreamType(nextTag) == MKTAG16('p', 'c')) { // Palette Change byte firstEntry = chunk->readByte(); uint16 numEntries = chunk->readByte(); @@ -362,7 +362,7 @@ void AVIDecoder::readNextPacket() { delete chunk; videoTrack->markPaletteDirty(); - } else if (getStreamType(nextTag) == 'db') { + } else if (getStreamType(nextTag) == MKTAG16('d', 'b')) { // TODO: Check if this really is uncompressed. Many videos // falsely put compressed data in here. error("Uncompressed AVI frame found"); |