diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:01:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:01:46 +0200 |
commit | 74409bff4ce90868b878f642873bf75a6c0ecee7 (patch) | |
tree | 0687186578ca63cc93f39ec94c8640ea242ffbe9 /libavcodec/sanm.c | |
parent | 645bc997722e5d29a5b874a29fbf857082e09c0a (diff) | |
parent | d0e66cb1c7cf2a9ef12963cdc6fd49a35599a9dd (diff) | |
download | ffmpeg-74409bff4ce90868b878f642873bf75a6c0ecee7.tar.gz |
Merge commit 'd0e66cb1c7cf2a9ef12963cdc6fd49a35599a9dd' into release/2.2
* commit 'd0e66cb1c7cf2a9ef12963cdc6fd49a35599a9dd':
alsdec: limit avctx->bits_per_raw_sample to 32
See: 4c2b88678b436f59132386d9be2fc143e3ee480d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions