diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:09:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:10:12 +0200 |
| commit | 0756fa87bffd24a71d034e634d05ad14c2d81e4a (patch) | |
| tree | 8b761ee36a641a3a37c9dd20338ecbeaf46ac850 /libavcodec | |
| parent | 3a0a2c2586cdd2dc986a52ba2b668ccce805b901 (diff) | |
| parent | d36d3ae02ca7d535de2b26fa0b3ab44387d19b6a (diff) | |
| download | ffmpeg-0756fa87bffd24a71d034e634d05ad14c2d81e4a.tar.gz | |
Merge commit 'd36d3ae02ca7d535de2b26fa0b3ab44387d19b6a' into release/2.2
* commit 'd36d3ae02ca7d535de2b26fa0b3ab44387d19b6a':
alsdec: check sample pointer range in revert_channel_correlation
Conflicts:
libavcodec/alsdec.c
See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions