[FFmpeg-cvslog] Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'
Michael Niedermayer
git at videolan.org
Sun Apr 13 04:03:40 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 04:00:28 2014 +0200| [d7644e0fdb5c6ba58091b62a27ba9eda4fd159f0] | committer: Michael Niedermayer
Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'
* commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731':
tiffdec: support predictor type 2 with RGB48 pixel format
Conflicts:
libavcodec/tiff.c
See: 72381b2b479d99962092ce458ac8e98f00528f86
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7644e0fdb5c6ba58091b62a27ba9eda4fd159f0
---
More information about the ffmpeg-cvslog
mailing list