[FFmpeg-cvslog] Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 14:48:38 2014 +0200| [957457a044f6b03453cbc4f817a051cbe1e388eb] | committer: Michael Niedermayer

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: d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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