Merge commit '97010c74cbff177b58daf9a092b4e37a7da26f85' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 01:09:49 +0000 (03:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 01:10:00 +0000 (03:10 +0200)
commit8d3a967635c321df4c0cc9e99988719b3349429b
tree8f136566a5261293c42a65fe11783ff93fa98f4e
parent1cb470934a26a6e73c61a2cc36f0d5063bdced29
parent97010c74cbff177b58daf9a092b4e37a7da26f85
Merge commit '97010c74cbff177b58daf9a092b4e37a7da26f85' into release/2.4

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

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