[FFmpeg-cvslog] Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 13:19:26 2014 +0200| [61917a104e0ce8d7b3b74ad66624a4f295b41c71] | committer: Michael Niedermayer

Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'

* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
  matroskaenc: write the channel mask for FLAC

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61917a104e0ce8d7b3b74ad66624a4f295b41c71
---