RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2015-06-30 21:19:16 +02:00
parent 2e9dcb82e5 303ec065a9
commit 4ff0c61ba8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aic.c
View File

@ -448,7 +448,7 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
ctx->num_x_slices = (ctx->mb_width + 15) >> 4; ctx->num_x_slices = (ctx->mb_width + 15) >> 4;
ctx->slice_width = 16; ctx->slice_width = 16;
for (i = 1; i < 32; i++) { 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->slice_width = ctx->mb_width / i;
ctx->num_x_slices = i; ctx->num_x_slices = i;
break; break;