]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:59:35 +0000 (22:59 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:59:35 +0000 (22:59 +0100)
* commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec':
  Add an OpenH264 decoder wrapper

This commit is a noop, see c5d326f551b0312ff581bf1df35b21d956e01523

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

Trivial merge