Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:23:26 +0000 (22:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:24:36 +0000 (22:24 +0200)
commitd832020bd853f84b96a3fdf3e0a385d8492ec8c8
treedb1747ea96f6e0460f085004bdb4780cf9f62c02
parente0a03d1f9cb18139ede8c3d0263a21828494c951
parent6d899d0206e91a3a74680b47ec06ef1dbc151c21
Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2

* commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21':
  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@gmx.at>
libavutil/lzo.c