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
17 years ago · e7a5e2f626
parent 78db672cae
commit e7a5e2f626
1 changed files with 2 additions and 5 deletions
--- 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;