[FFmpeg-cvslog] Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
Michael Niedermayer
git at videolan.org
Tue Apr 1 04:19:23 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 1 04:09:22 2014 +0200| [4ebfcd62af117ed7f343a0e52709a6409e0913f4] | committer: Michael Niedermayer
Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
sgi: encode images with 4 channels at 8 and 16 bits
Conflicts:
Changelog
libavcodec/sgienc.c
See: 21a100610977a163fe6480b5cf4c25f34f64b86b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ebfcd62af117ed7f343a0e52709a6409e0913f4
---
More information about the ffmpeg-cvslog
mailing list