[FFmpeg-cvslog] Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 11:30:29 2016 +0200| [93a0f4a3cbb823b2ddcb66a3a4c8f08aa7934078] | committer: Clément Bœsch

Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'

* commit '4012fe1ee819edc7689e182189e66c5401fb4b41':
  ape: Unbreak adaptcoeffs computation

This commit is a noop, see dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a

Merged-by: Clément Bœsch <clement at stupeflix.com>

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