ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Sat Dec 
20 13:14:32 2014 +0100| [0d31a01d3a5c8f52286e9d4ec359542a6faa79f7] | committer: 
Michael Niedermayer

Merge commit '92888e9ed4ea4e761ae953bbe28c85cc658abc8f' into release/2.2

* commit '92888e9ed4ea4e761ae953bbe28c85cc658abc8f':
  gifdec: refactor interleave end handling

Conflicts:
        libavcodec/gifdec.c

See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to