[FFmpeg-cvslog] cosmetics, remove unused and rename variables for consistency

Jean First git at videolan.org
Sun Sep 25 16:56:01 CEST 2011


ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Fri Sep 23 08:22:31 2011 +0200| [251345a3fe221d60e9b275567085f9475de68092] | committer: Michael Niedermayer

cosmetics, remove unused and rename variables for consistency

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

 libavcodec/tiff.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 06b5b8e..eeafa8b 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -614,23 +614,20 @@ static int decode_frame(AVCodecContext *avctx,
                 dst += stride;
             }
         } else {
-        for(i = 0; i < s->height; i++) {
-            for(j = soff; j < ssize; j++)
-                dst[j] += dst[j - soff];
-            dst += stride;
-        }
+            for(i = 0; i < s->height; i++) {
+                for(j = soff; j < ssize; j++)
+                    dst[j] += dst[j - soff];
+                dst += stride;
+            }
         }
     }
 
     if(s->invert){
-        uint8_t *src;
-        int j;
-
-        src = s->picture.data[0];
-        for(j = 0; j < s->height; j++){
-            for(i = 0; i < s->picture.linesize[0]; i++)
-                src[i] = (s->avctx->pix_fmt == PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - src[i];
-            src += s->picture.linesize[0];
+        dst = s->picture.data[0];
+        for(i = 0; i < s->height; i++){
+            for(j = 0; j < s->picture.linesize[0]; j++)
+                dst[j] = (s->avctx->pix_fmt == PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j];
+            dst += s->picture.linesize[0];
         }
     }
     *picture= *(AVFrame*)&s->picture;



More information about the ffmpeg-cvslog mailing list