[FFmpeg-cvslog] Merge commit 'eac49477aa95cf727d87d2741ee8e60be59d394b' into release/2.4

Michael Niedermayer git at videolan.org
Sat Dec 20 12:20:15 CET 2014


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 12:15:02 2014 +0100| [9b9411c1cf97da1eeb8a1f09281ed7455590beb3] | committer: Michael Niedermayer

Merge commit 'eac49477aa95cf727d87d2741ee8e60be59d394b' into release/2.4

* commit 'eac49477aa95cf727d87d2741ee8e60be59d394b':
  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=9b9411c1cf97da1eeb8a1f09281ed7455590beb3
---





More information about the ffmpeg-cvslog mailing list