[FFmpeg-cvslog] Merge commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 11 00:37:56 2015 +0200| [235e903b6323451b2f5673d9b2ca1ce5b078c505] | committer: Michael Niedermayer

Merge commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb'

* commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb':
  imc: Use correct position for flcoeffs2 calculation

See: 75fd5ce4c1c0b2d96d71c74b650cefaaef519d27
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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