diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:58:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 13:09:35 +0100 |
| commit | bcaef717ec0ff957ae438aa274e1685d7ebfd979 (patch) | |
| tree | 84857db0f1a924e3b1ebf664122c203cffb94508 /libswresample/x86 | |
| parent | 932d8d790ccf4e8ce67b97057e5aaf738bbfc65a (diff) | |
| parent | b99ca863506f0630514921b740b78364de67a3ff (diff) | |
| download | ffmpeg-bcaef717ec0ff957ae438aa274e1685d7ebfd979.tar.gz | |
Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'
* commit 'b99ca863506f0630514921b740b78364de67a3ff':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
0 files changed, 0 insertions, 0 deletions