[FFmpeg-cvslog] Merge commit '14e558024642638085ae2bbeffc6087612e6a3f9'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 12:40:53 2015 +0200| [9f56aceaec5c2e2acd3df91527c95d14ac910bdc] | committer: Hendrik Leppkes

Merge commit '14e558024642638085ae2bbeffc6087612e6a3f9'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f56aceaec5c2e2acd3df91527c95d14ac910bdc
---