|
|
@ -518,17 +518,17 @@ int ff_jpeg2000_dwt_init(DWTContext *s, uint16_t border[2][2], |
|
|
|
} |
|
|
|
} |
|
|
|
switch (type) { |
|
|
|
switch (type) { |
|
|
|
case FF_DWT97: |
|
|
|
case FF_DWT97: |
|
|
|
s->f_linebuf = av_malloc((maxlen + 12) * sizeof(*s->f_linebuf)); |
|
|
|
s->f_linebuf = av_malloc_array((maxlen + 12), sizeof(*s->f_linebuf)); |
|
|
|
if (!s->f_linebuf) |
|
|
|
if (!s->f_linebuf) |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case FF_DWT97_INT: |
|
|
|
case FF_DWT97_INT: |
|
|
|
s->i_linebuf = av_malloc((maxlen + 12) * sizeof(*s->i_linebuf)); |
|
|
|
s->i_linebuf = av_malloc_array((maxlen + 12), sizeof(*s->i_linebuf)); |
|
|
|
if (!s->i_linebuf) |
|
|
|
if (!s->i_linebuf) |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case FF_DWT53: |
|
|
|
case FF_DWT53: |
|
|
|
s->i_linebuf = av_malloc((maxlen + 6) * sizeof(*s->i_linebuf)); |
|
|
|
s->i_linebuf = av_malloc_array((maxlen + 6), sizeof(*s->i_linebuf)); |
|
|
|
if (!s->i_linebuf) |
|
|
|
if (!s->i_linebuf) |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
return AVERROR(ENOMEM); |
|
|
|
break; |
|
|
|
break; |
|
|
|