[FFmpeg-cvslog] Merge commit '1f80742f49a9a4e846c9f099387881abc87150b2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 21 23:45:26 2014 +0100| [70e3fae88d5993b69016c82d4528ad343cc19e3b] | committer: Michael Niedermayer

Merge commit '1f80742f49a9a4e846c9f099387881abc87150b2'

* commit '1f80742f49a9a4e846c9f099387881abc87150b2':
  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=70e3fae88d5993b69016c82d4528ad343cc19e3b
---