diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 14:48:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 14:52:54 +0200 |
| commit | 957457a044f6b03453cbc4f817a051cbe1e388eb (patch) | |
| tree | 044b8d765c0be368fa788e1fca5abcc47a434592 /libavcodec/cavsdec.c | |
| parent | cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8 (diff) | |
| parent | ccda51b14c0fcae2fad73a24872dce75a7964996 (diff) | |
| download | ffmpeg-957457a044f6b03453cbc4f817a051cbe1e388eb.tar.gz | |
Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996'
* commit 'ccda51b14c0fcae2fad73a24872dce75a7964996':
lzo: Handle integer overflow
Conflicts:
libavutil/lzo.c
This is basically not merging changes due to this being fixed differently
in FFmpeg
See: d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
0 files changed, 0 insertions, 0 deletions