Merge commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909' into release/2.4
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 20 Aug 2015 12:17:55 +0000 (14:17 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 20 Aug 2015 12:20:26 +0000 (14:20 +0200)
commitf141ac2d7028d982d55219d05dc0b647c2502527
treedc9c3e904bb54876db9c009daea87d38f0e11344
parente0f859e8fe141c7bb23a99c70229199508b964c2
parentc49b88b93bca53c04f18d78c27dbf1dc6daea909
Merge commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909' into release/2.4

* commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909':
  opusdec: properly handle mismatching configurations in multichannel streams

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/opus.h
libavcodec/opusdec.c