diff options
Diffstat (limited to 'image/codecs/indeo')
-rw-r--r-- | image/codecs/indeo/get_bits.h | 2 | ||||
-rw-r--r-- | image/codecs/indeo/indeo.cpp | 7 | ||||
-rw-r--r-- | image/codecs/indeo/indeo.h | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/image/codecs/indeo/get_bits.h b/image/codecs/indeo/get_bits.h index 336cfa39be..986bfc8a99 100644 --- a/image/codecs/indeo/get_bits.h +++ b/image/codecs/indeo/get_bits.h @@ -22,7 +22,7 @@ #include "common/scummsys.h" -/* Intel Indeo 4 bitstream reader +/* Indeo 4 & 5 bitstream reader * * Original copyright note: * Copyright (c) 2004 Michael Niedermayer diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp index 2c11a09883..1968638436 100644 --- a/image/codecs/indeo/indeo.cpp +++ b/image/codecs/indeo/indeo.cpp @@ -83,13 +83,6 @@ static const IVIHuffDesc ivi_blk_huff_desc[8] = { */ #define IVI_NUM_TILES(stride, tile_size) (((stride) + (tile_size) - 1) / (tile_size)) - -/** - * calculate number of macroblocks in a tile - */ -#define IVI_MBs_PER_TILE(tile_width, tile_height, mb_size) \ - ((((tile_width) + (mb_size) - 1) / (mb_size)) * (((tile_height) + (mb_size) - 1) / (mb_size))) - /*------------------------------------------------------------------------*/ int IVIHuffDesc::ivi_create_huff_from_desc(VLC *vlc, int flag) const { diff --git a/image/codecs/indeo/indeo.h b/image/codecs/indeo/indeo.h index a786995144..c9d556a92f 100644 --- a/image/codecs/indeo/indeo.h +++ b/image/codecs/indeo/indeo.h @@ -81,6 +81,12 @@ typedef void(*ivi_mc_avg_func) (int16 *buf, const int16 *ref_buf1, #define IVI_TOSIGNED(val) (-(((val) >> 1) ^ -((val) & 1))) /** + * calculate number of macroblocks in a tile + */ +#define IVI_MBs_PER_TILE(tile_width, tile_height, mb_size) \ + ((((tile_width) + (mb_size) - 1) / (mb_size)) * (((tile_height) + (mb_size) - 1) / (mb_size))) + +/** * huffman codebook descriptor */ struct IVIHuffDesc { |