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)
commitfae545ca2a34973e60e9c918bfefe2b2dd7cffb8
treedb0144561c823adc63a5b9958d8694bcf9219ebf
parent449bd3c0c33c2ea52ae232d149d0207d53f34a88
parent1973079417e8701b52ba810a72cb6c7c6f7f9a56
Merge commit '1973079417e8701b52ba810a72cb6c7c6f7f9a56'

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

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