[FFmpeg-cvslog] Merge commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr  3 21:05:03 2017 +0200| [d1c2c210bfeeda209e11efcc980b7c9781000c40] | committer: Clément Bœsch

Merge commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d'

* commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d':
  libopusdec: default to stereo for invalid number of channels

This commit is a noop, see 8c8f543b81aa2b50bb6a6cfd370a0061281492a3

Merged-by: Clément Bœsch <u at pkh.me>

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