From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 27 Feb 2015 19:00:25 +0000 (+0000)
Subject: aic: Fix decoding files with odd dimensions
X-Git-Tag: v11.4~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3dafb63d05896aacf84caf0e4c81c216476d60e;p=platform%2Fupstream%2Flibav.git

aic: Fix decoding files with odd dimensions

Normally the aic decoder finds the proper slice combination (multiple of
some number less than 32) but in case of odd width, it resorts to the
default values, which were actually swapped.
The number of slices is modified to account for such odd width cases.

CC: libav-stable@libav.org
(cherry picked from commit e878ec0d47cd6228c367b2f3128b76d7523f7255)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/libavcodec/aic.c b/libavcodec/aic.c
index dac9d8b..5687dbe 100644
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -434,8 +434,8 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
     ctx->mb_width  = FFALIGN(avctx->width,  16) >> 4;
     ctx->mb_height = FFALIGN(avctx->height, 16) >> 4;
 
-    ctx->num_x_slices = 16;
-    ctx->slice_width  = ctx->mb_width / 16;
+    ctx->num_x_slices = (ctx->mb_width + 15) >> 4;
+    ctx->slice_width  = 16;
     for (i = 1; i < 32; i++) {
         if (!(ctx->mb_width % i) && (ctx->mb_width / i < 32)) {
             ctx->slice_width  = ctx->mb_width / i;