[FFmpeg-cvslog] Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
Michael Niedermayer
git at videolan.org
Thu Jan 15 06:29:32 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 06:00:25 2015 +0100| [3779973a9b8e473718cbd8490f277e589b27a9f6] | committer: Michael Niedermayer
Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
tiff: support decoding GBRP and GBRAP formats
Conflicts:
libavcodec/tiff.c
See: 379ad9788b80e05c0379adc49b26704dfd27d564
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3779973a9b8e473718cbd8490f277e589b27a9f6
---
More information about the ffmpeg-cvslog
mailing list