[FFmpeg-cvslog] Merge commit '97010c74cbff177b58daf9a092b4e37a7da26f85' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 03:09:49 2015 +0200| [8d3a967635c321df4c0cc9e99988719b3349429b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d3a967635c321df4c0cc9e99988719b3349429b
---