Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jun 2014 01:08:22 +0000 (03:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jun 2014 01:08:22 +0000 (03:08 +0200)
commitd77ad6ec2d14db84973faf53cc1405d517769391
tree266335c731c15289a5e509c01e54634be114c659
parent6a968073daa74ffb98368fefd476a4562ce84e1b
parente7f5dacd55deeee8a866020b8463f829b2c5971f
Merge commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f' into release/0.10

* commit 'e7f5dacd55deeee8a866020b8463f829b2c5971f':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/lzo.c