diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-05 22:55:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-05 22:56:11 +0200 |
| commit | ff849e11e361a8e5161cf4f2896acfeeec1caeef (patch) | |
| tree | 35754426c5bc8a5858c60719f416178723e6ac9e /libavfilter/af_silenceremove.c | |
| parent | 9810aa340842621d72bb46ec880260a7bf1da1b9 (diff) | |
| parent | 94bb1ce882a12b6d7a1fa32715a68121b39ee838 (diff) | |
| download | ffmpeg-ff849e11e361a8e5161cf4f2896acfeeec1caeef.tar.gz | |
Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'
* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838':
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 'libavfilter/af_silenceremove.c')
0 files changed, 0 insertions, 0 deletions