Commit 8af88335 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0b39ac6f'

* commit '0b39ac6f':
  gifdec: refactor interleave end handling

Conflicts:
	libavcodec/gifdec.c

See: 8f145786Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 96ff6d38 0b39ac6f
......@@ -282,7 +282,7 @@ static int gif_read_image(GifState *s, AVFrame *frame)
break;
}
while (y1 >= height) {
y1 = 4 >> pass;
y1 = 4 >> pass;
ptr = ptr1 + linesize * y1;
pass++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment