diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:19:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:19:22 +0200 |
| commit | 4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8 (patch) | |
| tree | 267158afe5998e5f40232e0a9e0f2478e54931d3 /libavcodec/aic.c | |
| parent | 2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016 (diff) | |
| parent | 303ec065a90498c29d384b4add2ac626bc38d5eb (diff) | |
| download | ffmpeg-streaming-4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8.zip ffmpeg-streaming-4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8.tar.gz | |
Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'
* commit '303ec065a90498c29d384b4add2ac626bc38d5eb':
aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aic.c')
| -rw-r--r-- | libavcodec/aic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aic.c b/libavcodec/aic.c index c747bb0..3ca4ffd 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -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; |
