diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:12:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:13:10 +0100 |
| commit | 4f72aef342c8db1619bd55c8592f9f3fa28957fe (patch) | |
| tree | 4de890e3dae923e2ad68e39b2ed4b6a16447d10f /libavcodec/xiph.c | |
| parent | 6f14434218878c2f31c03e1a43b3506f398d6d7c (diff) | |
| parent | fbc20c3b85be169389b6c9f8806a311d3dea91ea (diff) | |
| download | ffmpeg-4f72aef342c8db1619bd55c8592f9f3fa28957fe.tar.gz | |
Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4
* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions