RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903' 

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

Conflicts:
	libavcodec/gifdec.c

See: 8f1457864b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-19 13:14:09 +01:00
parent 96ff6d3805 0b39ac6f54
commit 8af8833591
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/gifdec.c
View File

@ -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++;
}