[Scummvm-cvs-logs] scummvm master -> 5e715f244bc2d03d9532d09b87ba5baca8d988ac
clone2727
clone2727 at gmail.com
Mon Mar 3 03:04:31 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5e715f244b VIDEO: Handle the raw AVI video chunk the same as the others
Commit: 5e715f244bc2d03d9532d09b87ba5baca8d988ac
https://github.com/scummvm/scummvm/commit/5e715f244bc2d03d9532d09b87ba5baca8d988ac
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-03-02T17:59:00-08:00
Commit Message:
VIDEO: Handle the raw AVI video chunk the same as the others
Changed paths:
video/avi_decoder.cpp
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 0697d89..9b196fe 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -71,7 +71,6 @@ namespace Video {
// Stream Types
enum {
kStreamTypePaletteChange = MKTAG16('p', 'c'),
- kStreamTypeRawVideo = MKTAG16('d', 'b'),
kStreamTypeAudio = MKTAG16('w', 'b')
};
@@ -399,10 +398,6 @@ void AVIDecoder::readNextPacket() {
if (getStreamType(nextTag) == kStreamTypePaletteChange) {
// Palette Change
videoTrack->loadPaletteFromChunk(chunk);
- } else if (getStreamType(nextTag) == kStreamTypeRawVideo) {
- // TODO: Check if this really is uncompressed. Many videos
- // falsely put compressed data in here.
- error("Uncompressed AVI frame found");
} else {
// Otherwise, assume it's a compressed frame
videoTrack->decodeFrame(chunk);
More information about the Scummvm-git-logs
mailing list