diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:31:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:31:23 +0100 |
| commit | e2c82f7d9362192671bff9959303892107c5d114 (patch) | |
| tree | 6d44ecf17b1c0f002322b1d1524732b40607f5d6 | |
| parent | d208977cd1c47ddc0281186a6f0521b4b4bd6c1a (diff) | |
| parent | f3dafb63d05896aacf84caf0e4c81c216476d60e (diff) | |
| download | ffmpeg-e2c82f7d9362192671bff9959303892107c5d114.tar.gz | |
Merge commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e' into release/2.4
* commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e':
aic: Fix decoding files with odd dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/aic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aic.c b/libavcodec/aic.c index 3472301f53..5882bf1b9a 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -438,8 +438,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; |