Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:28:23 +0000 (12:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:28:23 +0000 (12:28 +0200)
commit61301ca7860fb044995c71a0cd432cb3d833eb3b
treeebe79c242179339032ea8528a3a5bb0b65457fff
parent03ffaed3f0199f82ae32c28923f41f22123aea95
parent54ed488b1af583df6c9d2a73b4a44f16b7e4f82c
Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'

* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flacenc.c
libavformat/flacenc.h
libavformat/flacenc_header.c