diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-29 03:08:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-29 03:08:22 +0200 |
| commit | d77ad6ec2d14db84973faf53cc1405d517769391 (patch) | |
| tree | 266335c731c15289a5e509c01e54634be114c659 /libswresample/audioconvert.c | |
| parent | 6a968073daa74ffb98368fefd476a4562ce84e1b (diff) | |
| parent | e7f5dacd55deeee8a866020b8463f829b2c5971f (diff) | |
| download | ffmpeg-d77ad6ec2d14db84973faf53cc1405d517769391.tar.gz | |
Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10
* commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f':
lzo: Handle integer overflow
Conflicts:
libavutil/lzo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions