[FFmpeg-cvslog] Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 25 22:40:30 2014 +0200| [a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7] | committer: Michael Niedermayer

Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

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

Conflicts:
	libavutil/lzo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7
---