Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:32:57 +0000 (22:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:33:21 +0000 (22:33 +0200)
commitdf95281618459fdf992e9a9a4da5b84a2b4f0c1b
tree35754426c5bc8a5858c60719f416178723e6ac9e
parent54d985db847bb3b9b9a45790bc9343c4afe0b14e
parente191aaca44b986816695e3b7ecfae64697fd6631
Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'

* commit 'e191aaca44b986816695e3b7ecfae64697fd6631':
  alsdec: limit avctx->bits_per_raw_sample to 32

See: 4c2b88678b436f59132386d9be2fc143e3ee480d
Merged-by: Michael Niedermayer <michaelni@gmx.at>