OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
560f518
)
avcodec/aic: unbreak decoding of files with slice_width != 16
author
Paul B Mahol
<onemda@gmail.com>
Fri, 24 Feb 2017 10:29:42 +0000
(11:29 +0100)
committer
Paul B Mahol
<onemda@gmail.com>
Fri, 24 Feb 2017 10:35:02 +0000
(11:35 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/aic.c
patch
|
blob
|
history
diff --git
a/libavcodec/aic.c
b/libavcodec/aic.c
index
4faa574
..
67d78c5
100644
(file)
--- a/
libavcodec/aic.c
+++ b/
libavcodec/aic.c
@@
-449,7
+449,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++) {
+ for (i = 1; i <
ctx->mb_width
; i++) {
if (!(ctx->mb_width % i) && (ctx->mb_width / i <= 32)) {
ctx->slice_width = ctx->mb_width / i;
ctx->num_x_slices = i;