RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-10 00:59:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'eac49477aa95cf727d87d2741ee8e60be59d394b' into release/2.4

Browse Source 
* commit 'eac49477aa95cf727d87d2741ee8e60be59d394b':
  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-20 12:15:02 +01:00
commit 9b9411c1cf
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++;
}