aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-19 13:14:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-19 13:28:57 +0100
commit8af8833591d3efb26dcb0bb6f660cd0f3f107679 (patch)
treeec01249287336149ace41cc75088fafe9653c68b
parent96ff6d38050e42ae33b1a691109e24748bd62d5d (diff)
parent0b39ac6f54505a538c21fe49a626de94c518c903 (diff)
downloadffmpeg-8af8833591d3efb26dcb0bb6f660cd0f3f107679.tar.gz
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
* commit '0b39ac6f54505a538c21fe49a626de94c518c903': gifdec: refactor interleave end handling Conflicts: libavcodec/gifdec.c See: 8f1457864be8fb9653643519dea1c6492f1dde57 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/gifdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index 90de38b2e5..9ba436e14c 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -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++;
}