[FFmpeg-cvslog] Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 29 03:08:22 2014 +0200| [d77ad6ec2d14db84973faf53cc1405d517769391] | committer: Michael Niedermayer

Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10

* commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f':
  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=d77ad6ec2d14db84973faf53cc1405d517769391
---