Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'

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

Conflicts:
	libavcodec/gifdec.c

See: 8f1457864b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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