Merge commit '14e558024642638085ae2bbeffc6087612e6a3f9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:40:53 +0000 (12:40 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:40:53 +0000 (12:40 +0200)
commit9f56aceaec5c2e2acd3df91527c95d14ac910bdc
tree792217f6effd45a897976aae7b2eacb8a7e4e64a
parent190e52112339c62b213d7ccb0daab5ffe387af49
parent14e558024642638085ae2bbeffc6087612e6a3f9
Merge commit '14e558024642638085ae2bbeffc6087612e6a3f9'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/opus.h
libavcodec/opusdec.c