Merge commit 'ccda51b1'
* commit 'ccda51b1': lzo: Handle integer overflow Conflicts: libavutil/lzo.c This is basically not merging changes due to this being fixed differently in FFmpeg See: d6af26c5 See: cf2b7c01Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment