[FFmpeg-cvslog] avcodec/tiff: remove byte based bpp special case

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 20 01:50:34 2013 +0200| [6338f1b3c095d44c2b461550aa1e4b88d220bb78] | committer: Michael Niedermayer

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 at gmx.at>

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

 libavcodec/tiff.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 0e8ddec..cfa7e8c 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;