]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:30:29 +0000 (11:30 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:30:29 +0000 (11:30 +0200)
* commit '4012fe1ee819edc7689e182189e66c5401fb4b41':
  ape: Unbreak adaptcoeffs computation

This commit is a noop, see dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a

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

Trivial merge