Merge commit 'ca78ee73db9e059f501706ba6108e23902e84933' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 00:19:28 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 00:19:28 +0000 (01:19 +0100)
* commit 'ca78ee73db9e059f501706ba6108e23902e84933':
  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