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)
commita600e7145f9e32365714e4e289446706661ea4c1
tree5159b0909fa5cd7b5413cd16835bffaf8896ba6b
parent352eb4b5992e5784dfcb8a55f038f3ac00e406ca
parent5b142a4d334bfa8ee5ec5f364c26c98ddb425fac
Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'

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

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