aboutsummaryrefslogtreecommitdiff
path: root/image/codecs/indeo5.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-09-11 09:42:12 -0400
committerPaul Gilbert2016-09-11 09:42:12 -0400
commit08143af48293b007027d11271d3f66f7ad3107e6 (patch)
tree74d4bbcf5967b7d06aedab2a4b8cb2c367040ba9 /image/codecs/indeo5.cpp
parenta5f43663875e789baa8b7d9e79d5da4b3362f04a (diff)
downloadscummvm-rg350-08143af48293b007027d11271d3f66f7ad3107e6.tar.gz
scummvm-rg350-08143af48293b007027d11271d3f66f7ad3107e6.tar.bz2
scummvm-rg350-08143af48293b007027d11271d3f66f7ad3107e6.zip
IMAGE: Further formatting of Indeo decoders
Diffstat (limited to 'image/codecs/indeo5.cpp')
-rw-r--r--image/codecs/indeo5.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/image/codecs/indeo5.cpp b/image/codecs/indeo5.cpp
index 00ca032ec0..d5ce571bea 100644
--- a/image/codecs/indeo5.cpp
+++ b/image/codecs/indeo5.cpp
@@ -100,8 +100,7 @@ const Graphics::Surface *Indeo5Decoder::decodeFrame(Common::SeekableReadStream &
}
int Indeo5Decoder::decodePictureHeader() {
- IVIPicConfig picConf;
-
+ IVIPicConfig picConf;
int ret;
if (_ctx._gb->getBits(5) != 0x1F) {
@@ -201,8 +200,8 @@ bool Indeo5Decoder::isNonNullFrame() const {
}
int Indeo5Decoder::decodeBandHeader(IVIBandDesc *band) {
- int i, ret;
- uint8 bandFlags;
+ int i, ret;
+ uint8 bandFlags;
bandFlags = _ctx._gb->getBits(8);
@@ -259,10 +258,9 @@ int Indeo5Decoder::decodeBandHeader(IVIBandDesc *band) {
}
int Indeo5Decoder::decodeMbInfo(IVIBandDesc *band, IVITile *tile) {
- int x, y, mvX, mvY, mvDelta, offs, mbOffset,
- mvScale, blksPerMb, s;
- IVIMbInfo *mb, *refMb;
- int rowOffset = band->_mbSize * band->_pitch;
+ int x, y, mvX, mvY, mvDelta, offs, mbOffset, mvScale, blksPerMb, s;
+ IVIMbInfo *mb, *refMb;
+ int rowOffset = band->_mbSize * band->_pitch;
mb = tile->_mbs;
refMb = tile->_refMbs;
@@ -386,11 +384,11 @@ int Indeo5Decoder::decodeMbInfo(IVIBandDesc *band, IVITile *tile) {
}
int Indeo5Decoder::decode_gop_header() {
- int result, i, p, tileSize, picSizeIndx, mbSize, blkSize, isScalable;
- int quantMat;
- bool blkSizeChanged = false;
- IVIBandDesc *band, *band1, *band2;
- IVIPicConfig picConf;
+ int result, i, p, tileSize, picSizeIndx, mbSize, blkSize, isScalable;
+ int quantMat;
+ bool blkSizeChanged = false;
+ IVIBandDesc *band, *band1, *band2;
+ IVIPicConfig picConf;
_ctx._gopFlags = _ctx._gb->getBits(8);