[FFmpeg-cvslog] Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 11:12:32 2015 +0200| [a600e7145f9e32365714e4e289446706661ea4c1] | committer: Hendrik Leppkes

Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'

* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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