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)
commit56b84b023d705a2716a5a52948584874c8db7b05
tree6454605aa92d2977dc339cf9c9e86200d0de69a9
parent0e216ed40789e382eb6725d1cd0941927bfd1400
parentca78ee73db9e059f501706ba6108e23902e84933
Merge commit 'ca78ee73db9e059f501706ba6108e23902e84933' into release/2.4

* commit 'ca78ee73db9e059f501706ba6108e23902e84933':
  opusdec: make sure all substreams have the same number of coded samples

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