mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'
* commit '303ec065a90498c29d384b4add2ac626bc38d5eb': aic: Fix slice size computation for widths multiples of 32 macroblocks Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4ff0c61ba8
@ -448,7 +448,7 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
|
||||
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)) {
|
||||
if (!(ctx->mb_width % i) && (ctx->mb_width / i <= 32)) {
|
||||
ctx->slice_width = ctx->mb_width / i;
|
||||
ctx->num_x_slices = i;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user