diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-20 01:50:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-20 01:50:34 +0200 |
| commit | 6338f1b3c095d44c2b461550aa1e4b88d220bb78 (patch) | |
| tree | c04aa46a36cf1439f9a8f1fe43f72f3bc204f288 | |
| parent | 23d69b158af433fab118b6b261d3bafa059761f8 (diff) | |
| download | ffmpeg-6338f1b3c095d44c2b461550aa1e4b88d220bb78.tar.gz | |
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 <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/tiff.c | 3 |
1 files changed, 0 insertions, 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; |