[FFmpeg-cvslog] Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:14:19 2015 +0100| [f251409adc046881ddff4d0c2bedeae69ae83675] | committer: Michael Niedermayer

Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4

* commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0':
  qdm2: avoid integer overflow

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f251409adc046881ddff4d0c2bedeae69ae83675
---