Merge commit '1973079417e8701b52ba810a72cb6c7c6f7f9a56'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:00:06 +0000 (00:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 23:14:13 +0000 (00:14 +0100)
* commit '1973079417e8701b52ba810a72cb6c7c6f7f9a56':
  opusdec: make sure all substreams have the same number of coded samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/opusdec.c

Simple merge