Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:12:32 +0000 (11:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:12:32 +0000 (11:12 +0200)
* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

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

Trivial merge