summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.c
diff options
context:
space:
mode:
authorMaxim Poliakovski <max_pole@gmx.de>2010-03-08 06:49:16 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2010-03-08 06:49:16 +0000
commit5f1654b25b2b31442ef9c6242fbde241e7fc6d9c (patch)
treee110222be41a8c47745e3b9f65f2a18dd5abc9cc /libavcodec/ivi_common.c
parent55347a954ed18799e7db91d8dec5170b1bc58b6d (diff)
Scale tile dimensions in case both local decoding and scalability mode
are used in Indeo 5 stream. Patch by Maxim ($indeo5dec_author) Originally committed as revision 22318 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ivi_common.c')
-rw-r--r--libavcodec/ivi_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index e4cb42fb50..531b7d7521 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -256,6 +256,11 @@ int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_hei
t_width = !p ? tile_width : (tile_width + 3) >> 2;
t_height = !p ? tile_height : (tile_height + 3) >> 2;
+ if (!p && planes[0].num_bands == 4) {
+ t_width >>= 1;
+ t_height >>= 1;
+ }
+
for (b = 0; b < planes[p].num_bands; b++) {
band = &planes[p].bands[b];
x_tiles = IVI_NUM_TILES(band->width, t_width);