[FFmpeg-cvslog] Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
Michael Niedermayer
git at videolan.org
Tue Dec 17 18:09:28 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 17 17:58:06 2013 +0100| [47cc6168649485837b1e4fdd5f33f16c275933bd] | committer: Michael Niedermayer
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
png: add a standalone parser
Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47cc6168649485837b1e4fdd5f33f16c275933bd
---
More information about the ffmpeg-cvslog
mailing list