Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)
commit61917a104e0ce8d7b3b74ad66624a4f295b41c71
treeab83309115176af4990636e4e468bd87714bb69f
parentdff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb
parent106b62f4ba600f24415eaded5e020aeceb23fd59
Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'

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

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/matroskaenc.c