[FFmpeg-cvslog] Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
Michael Niedermayer
git at videolan.org
Tue Apr 1 04:04:37 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 1 04:01:28 2014 +0200| [23290c86bfe6797da2865bfbd238588fe5398ca2] | committer: Michael Niedermayer
Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
sgi: decode images with 4 channels at 8 and 16 bits
Conflicts:
Changelog
See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23290c86bfe6797da2865bfbd238588fe5398ca2
---
More information about the ffmpeg-cvslog
mailing list