Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Jun 2014 20:40:30 +0000 (22:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Jun 2014 20:40:30 +0000 (22:40 +0200)
commita8dd7fe5b9943500ace8ec9c51f8fdfdb8472ea7
treebee3bf93e6689e119fdc8d8367c6b17d82b3cab7
parent574bf2ce4ccd4f1a9ca054d5d6a6affe6c507387
parent503322f97c5a25a020933ed4ab510697d5f5b4af
Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

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

Conflicts:
libavutil/lzo.c

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