diff options
author | Colin Snover | 2017-08-24 21:17:54 -0500 |
---|---|---|
committer | Colin Snover | 2017-08-24 21:17:54 -0500 |
commit | 2b46eda5b67ccdca8ef9012020dea0766191fa16 (patch) | |
tree | e33a9a3ec84ac27964a77820e31e8e8d65b21d30 | |
parent | 4a39f85c1b283fe17531cfab4ba9b0cb7a6bd928 (diff) | |
download | scummvm-rg350-2b46eda5b67ccdca8ef9012020dea0766191fa16.tar.gz scummvm-rg350-2b46eda5b67ccdca8ef9012020dea0766191fa16.tar.bz2 scummvm-rg350-2b46eda5b67ccdca8ef9012020dea0766191fa16.zip |
IMAGE: Allow Indeo4 transparency decoding in scalable videos
y459.avi in Starship Titanic uses these two modes together, and
this appears to work fine.
-rw-r--r-- | image/codecs/indeo4.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/image/codecs/indeo4.cpp b/image/codecs/indeo4.cpp index bc777cfb85..a4eba85f49 100644 --- a/image/codecs/indeo4.cpp +++ b/image/codecs/indeo4.cpp @@ -761,11 +761,12 @@ int Indeo4Decoder::decodeTransparency() { } } - // FIXME: The transparency plane can be split, though it is not clear if - // this is in scalability mode, local decoding mode, or both. This adds - // complexity to the implementation, so avoid supporting unless it turns out - // to actually be necessary for correct decoding of game videos. - assert(!_ctx._isScalable); + // FIXME: The transparency plane can be split, apparently for local decoding + // mode (y459.avi in Titanic has the scalable flag and its transparency + // plane seems to be decoded successfully, so the split transparency plane + // does not seem to be related to scaling mode). This adds complexity to the + // implementation, so avoid supporting unless it turns out to actually be + // necessary for correct decoding of game videos. assert(!_ctx._usesTiling); assert(_surface.format.bytesPerPixel == 4); |