summaryrefslogtreecommitdiff
path: root/libavformat/gifdec.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-03-03 13:16:29 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-03-03 13:16:29 +0000
commite7a5e2f6266903b797cf01d34b7f93eb39ccc855 (patch)
tree377ec0478b6b36b187201be397e863c3860c8358 /libavformat/gifdec.c
parent78db672caeccd5e0af919ad188fbbae37c690624 (diff)
downloadffmpeg-e7a5e2f6266903b797cf01d34b7f93eb39ccc855.tar.gz
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
Diffstat (limited to 'libavformat/gifdec.c')
-rw-r--r--libavformat/gifdec.c7
1 files 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;