[FFmpeg-cvslog] Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 13:14:09 2014 +0100| [8eeeeb1fb3db0b07cda6dcd2261debcd8c406b1e] | committer: Michael Niedermayer

Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'

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

Conflicts:
	libavcodec/gifdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8eeeeb1fb3db0b07cda6dcd2261debcd8c406b1e
---