1. ffmpeg
  2. Commit a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7
Browse code

Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

* commit '503322f97c5a25a020933ed4ab510697d5f5b4af':
lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/06/26 05:40:30
Showing 1 changed files
libavutil/lzo.c
History View file @ a8dd7fe
... ... 
@@ -110,7 +110,7 @@ static inline void copy(LZOContext *c, int cnt)
110 110 
 /**
111 111 
  * @brief Copies previously decoded bytes to current position.
112 112 
  * @param back how many bytes back we start, must be > 0
113 
- * @param cnt number of bytes to copy, must be >= 0
113 
+ * @param cnt number of bytes to copy, must be > 0
114 114 
  *
115 115 
  * cnt > back is valid, this will copy the bytes we just copied,
116 116 
  * thus creating a repeating pattern with a period length of back.