[FFmpeg-cvslog] Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
Michael Niedermayer
git at videolan.org
Wed May 28 12:32:54 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 12:28:23 2014 +0200| [61301ca7860fb044995c71a0cd432cb3d833eb3b] | committer: Michael Niedermayer
Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61301ca7860fb044995c71a0cd432cb3d833eb3b
---
More information about the ffmpeg-cvslog
mailing list