[FFmpeg-cvslog] avcodec/tiff: remove TIFF_LONG special case

Michael Niedermayer git at videolan.org
Sun Oct 27 13:25:43 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 27 13:07:44 2013 +0100| [d5ad4e4a2f120b7390a86c99dcaefe1dd84f3f28] | committer: Michael Niedermayer

avcodec/tiff: remove TIFF_LONG special case

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/tiff.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index a22db43..e8c9950 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -582,11 +582,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
         switch (type) {
         case TIFF_BYTE:
         case TIFF_SHORT:
-            value = ff_tget(&s->gb, type, s->le);
-            break;
         case TIFF_LONG:
-            off   = ff_tget_long(&s->gb, s->le);
-            value = off;
+            value = ff_tget(&s->gb, type, s->le);
             break;
         case TIFF_STRING:
             if (count <= 4) {



More information about the ffmpeg-cvslog mailing list