diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-25 22:40:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-25 22:40:30 +0200 |
| commit | a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7 (patch) | |
| tree | bee3bf93e6689e119fdc8d8367c6b17d82b3cab7 | |
| parent | 574bf2ce4ccd4f1a9ca054d5d6a6affe6c507387 (diff) | |
| parent | 503322f97c5a25a020933ed4ab510697d5f5b4af (diff) | |
| download | ffmpeg-a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7.tar.gz | |
Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1
* commit '503322f97c5a25a020933ed4ab510697d5f5b4af':
lzo: Handle integer overflow
Conflicts:
libavutil/lzo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/lzo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/lzo.c b/libavutil/lzo.c index 6104fc3085..6a24a1dfc3 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -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. |