]> git.sesse.net Git - ffmpeg/commit
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)
commitb2554e61e0ba264638ff8b4926d8f3304727cdaf
treebda5790e6959ca5d64963800e06c4fb2de6accb3
parent8fad4b4e251bb21f8871fa829b593454528aff24
parent82b7525173f20702a8cbc26ebedbf4b69b8fecec
Merge commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec'

* commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec':
  Add an OpenH264 decoder wrapper

This commit is a noop, see c5d326f551b0312ff581bf1df35b21d956e01523

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