[FFmpeg-cvslog] Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
Michael Niedermayer
git at videolan.org
Mon Mar 17 15:38:56 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:32:07 2014 +0100| [3731c409890c2edd76ededfbc6038d940d2b0afb] | committer: Michael Niedermayer
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
png: Support rgb48 and rgba64 encoding
Conflicts:
libavcodec/pngenc.c
See: f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3731c409890c2edd76ededfbc6038d940d2b0afb
---
More information about the ffmpeg-cvslog
mailing list