]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'd825b1a5306576dcd0553b7d0d24a3a46ad92864'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:01:35 +0000 (15:01 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:01:35 +0000 (15:01 +0100)
* commit 'd825b1a5306576dcd0553b7d0d24a3a46ad92864':
  libopenh264: Support building with the 1.6 release

This commit is a noop, see 293676c476733e81d7b596736add6cd510eb6960

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge