[FFmpeg-cvslog] Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
Michael Niedermayer
git at videolan.org
Mon Mar 17 15:50:33 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:43:21 2014 +0100| [c738ffcf2c0717ed3546ea7e0d06cc4df2026024] | committer: Michael Niedermayer
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
* commit '58c215961a9067bb670387bbd72286c30de04b93':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See: edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c738ffcf2c0717ed3546ea7e0d06cc4df2026024
---
More information about the ffmpeg-cvslog
mailing list