[SCM] libav/experimental: Fix decoding of interlaced gif, e.g. http://samples.mplayerhq.hu/GIF/7up.gif

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e7a5e2f6266903b797cf01d34b7f93eb39ccc855
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Mon Mar 3 13:16:29 2008 +0000

    Fix decoding of interlaced gif, e.g. http://samples.mplayerhq.hu/GIF/7up.gif
    
    Originally committed as revision 12297 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c
index 5803e5e..82a80c8 100644
--- a/libavformat/gifdec.c
+++ b/libavformat/gifdec.c
@@ -364,11 +364,8 @@ static int gif_read_image(GifState *s)
                 y1 += 8;
                 ptr += linesize * 8;
                 if (y1 >= height) {
-                    y1 = 4;
-                    if (pass == 0)
-                        ptr = ptr1 + linesize * 4;
-                    else
-                        ptr = ptr1 + linesize * 2;
+                    y1 = pass == 0 ? 4 : 2;
+                    ptr = ptr1 + linesize * y1;
                     pass++;
                 }
                 break;

-- 
Libav/FFmpeg packaging