diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 20:20:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 20:41:44 +0100 |
| commit | 75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70 (patch) | |
| tree | 3f975f83ef519071b024b9a8d2e3230435468ad2 /libavcodec/aic.c | |
| parent | c285937ccc98109d0b5d4ba2e0560ebbb81f580f (diff) | |
| parent | e878ec0d47cd6228c367b2f3128b76d7523f7255 (diff) | |
| download | ffmpeg-streaming-75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70.zip ffmpeg-streaming-75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70.tar.gz | |
Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'
* commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255':
aic: Fix decoding files with odd dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aic.c')
| -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 e5e2236..648ccba 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; |
