Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:20:44 +0000 (12:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:21:50 +0000 (12:21 +0200)
commit03ffaed3f0199f82ae32c28923f41f22123aea95
treebd8b84c228cf36acce71d0206d570cd4aab6c280
parentef13967e601bb0851af04182ea2aeeea8a3025bd
parentd6b9ce99ea384fb676561461768b8316725a4ccd
Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'

* commit 'd6b9ce99ea384fb676561461768b8316725a4ccd':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag

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