[SCM] libav/experimental: tiffdec: rename variables for consistency and fix variable shadowing

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bf2064f046af64c59a416c814474a39b0a457569
Author: Jean First <jeanfirst at gmail.com>
Date:   Fri Sep 23 08:22:31 2011 +0200

    tiffdec: rename variables for consistency and fix variable shadowing
    
    Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 7fb0e7a..9f8bc60b 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -665,14 +665,11 @@ static int decode_frame(AVCodecContext *avctx,
     }
 
     if (s->invert) {
-        uint8_t *src;
-        int j;
-
-        src = p->data[0];
-        for (j = 0; j < s->height; j++) {
-            for (i = 0; i < p->linesize[0]; i++)
-                src[i] = 255 - src[i];
-            src += p->linesize[0];
+        dst = p->data[0];
+        for (i = 0; i < s->height; i++) {
+            for (j = 0; j < p->linesize[0]; j++)
+                dst[j] = 255 - dst[j];
+            dst += stride;
         }
     }
     *got_frame = 1;

-- 
Libav/FFmpeg packaging