Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 19:22:06 +0000 (21:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 19:25:10 +0000 (21:25 +0200)
commitcacc1dcadc788648779ea58201a8af25c2290676
tree9687606398b46c5ac6aaaef2656f2c610bf1fe7c
parent1b54e6b12bcf3090266ea632e52e8f8fe946397b
parent1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'

* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
  imc: fix order of operations in coefficients read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imc.c