Commit f1ab6962 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: Replace width overriding for bayer by assert

This is less confusing
Reviewed-by: 's avatarNick Renieris <velocityra@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 071e2231
...@@ -589,7 +589,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid ...@@ -589,7 +589,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
av_assert0(s->bpp == 24); av_assert0(s->bpp == 24);
} }
if (s->is_bayer) { if (s->is_bayer) {
width = (s->bpp * s->width + 7) >> 3; av_assert0(width == (s->bpp * s->width + 7) >> 3);
} }
if (p->format == AV_PIX_FMT_GRAY12) { if (p->format == AV_PIX_FMT_GRAY12) {
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, width); av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, width);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment