[SCM] libav/experimental: tiffdec: remove an unneeded variable

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:48 UTC 2014


The following commit has been merged in the experimental branch:
commit 345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Mon Sep 30 01:00:20 2013 -0400

    tiffdec: remove an unneeded variable

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index b32435c..d801302 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -300,7 +300,6 @@ static int tiff_decode_tag(TiffContext *s)
 {
     unsigned tag, type, count, off, value = 0;
     int i, start;
-    uint32_t *pal;
 
     if (bytestream2_get_bytes_left(&s->gb) < 12)
         return AVERROR_INVALIDDATA;
@@ -485,7 +484,6 @@ static int tiff_decode_tag(TiffContext *s)
         break;
     case TIFF_PAL: {
         GetByteContext pal_gb[3];
-        pal = (uint32_t *) s->palette;
         off = type_sizes[type];
         if (count / 3 > 256 ||
             bytestream2_get_bytes_left(&s->gb) < count / 3 * off * 3)
@@ -499,7 +497,7 @@ static int tiff_decode_tag(TiffContext *s)
             p |= (tget(&pal_gb[0], type, s->le) >> off) << 16;
             p |= (tget(&pal_gb[1], type, s->le) >> off) << 8;
             p |=  tget(&pal_gb[2], type, s->le) >> off;
-            pal[i] = p;
+            s->palette[i] = p;
         }
         s->palette_is_set = 1;
         break;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list