mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-20 08:15:06 +02:00
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:d6af26c55c
See:cf2b7c01f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
957457a044
@ -110,7 +110,7 @@ static inline void copy(LZOContext *c, int cnt)
|
||||
/**
|
||||
* @brief Copies previously decoded bytes to current position.
|
||||
* @param back how many bytes back we start, must be > 0
|
||||
* @param cnt number of bytes to copy, must be >= 0
|
||||
* @param cnt number of bytes to copy, must be > 0
|
||||
*
|
||||
* cnt > back is valid, this will copy the bytes we just copied,
|
||||
* thus creating a repeating pattern with a period length of back.
|
||||
|
Loading…
Reference in New Issue
Block a user