ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19 13:14:09 2014 +0100| [8af8833591d3efb26dcb0bb6f660cd0f3f107679] | committer: Michael Niedermayer
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903' * commit '0b39ac6f54505a538c21fe49a626de94c518c903': gifdec: refactor interleave end handling Conflicts: libavcodec/gifdec.c See: 8f1457864be8fb9653643519dea1c6492f1dde57 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8af8833591d3efb26dcb0bb6f660cd0f3f107679 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog