Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 12:11:29 +0000 (14:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 12:19:22 +0000 (14:19 +0200)
commit3eeca8b0e4e018ba7eecaea4aa1a3e40665ed42a
tree67d57c94e23761cbac48722f0bd42c5d833e143b
parent35307df53c578444decc8cfc02b376743fabea9c
parenta711a2cb473dc95708f371a82c85c97fe789b5c2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Avoid 32-bit wrapping of linesize multiplications

This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.

Merged-by: Michael Niedermayer <michaelni@gmx.at>