Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:14:19 +0000 (02:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:14:34 +0000 (02:14 +0100)
* commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0':
  qdm2: avoid integer overflow

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

Trivial merge