Merge commit 'e443165c323406d01da7e7930f042d265d01fb35' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:21:40 +0000 (13:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:21:40 +0000 (13:21 +0100)
commit3b7db9c4f55ddc51f5f29d169d379fe2c6402b11
tree97a8b3c34db9eb623dc368296e1d37eb5c19a1ee
parent0ddcee172ec8a8abc91c61c3a66bbfd432373976
parente443165c323406d01da7e7930f042d265d01fb35
Merge commit 'e443165c323406d01da7e7930f042d265d01fb35' into release/2.4

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

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