From e7a5e2f6266903b797cf01d34b7f93eb39ccc855 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Mon, 3 Mar 2008 13:16:29 +0000 Subject: 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 --- libavformat/gifdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c index 5803e5e5dc..82a80c8dcf 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; -- cgit v1.2.3