From 6338f1b3c095d44c2b461550aa1e4b88d220bb78 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Oct 2013 01:50:34 +0200 Subject: [PATCH] avcodec/tiff: remove byte based bpp special case This case does not work as off is uninitialized and it should be handled fine by the generic code below Fixes CID1108608 Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 0e8ddecbd0..cfa7e8c5f3 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -622,9 +622,6 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) else { switch (type) { case TIFF_BYTE: - s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + - ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF); - break; case TIFF_SHORT: case TIFF_LONG: s->bpp = 0;