Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:01:41 +0000 (13:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:02:19 +0000 (13:02 +0200)
commit579e2b2874aeaa9cfdeed1fd1408767e33a63029
tree021938ef7311d1439e74b710d721a8668c41d712
parent1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4
parent23f741f79327e31be7b2a75ebb2e02111e06e52f
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'

* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavformat/Makefile
libavformat/flacdec.c
libavformat/matroskadec.c
libavformat/oggdec.h
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseogm.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/oggparsetheora.c
libavformat/oggparsevorbis.c
libavformat/oggparsevp8.c