summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-02-15 16:42:07 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-04-29 23:42:36 +0200
commitf1ab6962ca0374aca67994035292d52ef89741b7 (patch)
treee86884c4febe31f84261b2e3fc8544586238346c /libavcodec
parent071e22312947d28032d68c3465779cbfe9532f55 (diff)
avcodec/tiff: Replace width overriding for bayer by assert
This is less confusing Reviewed-by: Nick Renieris <velocityra@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/tiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 5bdcac2006..39f5234d60 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -589,7 +589,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
av_assert0(s->bpp == 24);
}
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) {
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, width);