[FFmpeg-cvslog] avcodec/tiff: Replace width overriding for bayer by assert

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Feb 15 16:42:07 2020 +0100| [f1ab6962ca0374aca67994035292d52ef89741b7] | committer: Michael Niedermayer

avcodec/tiff: Replace width overriding for bayer by assert

This is less confusing

Reviewed-by: Nick Renieris <velocityra at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1ab6962ca0374aca67994035292d52ef89741b7
---

 libavcodec/tiff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);