OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8fad4b4
82b7525
)
Merge commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:59:35 +0000
(22:59 +0100)
committer
Hendrik 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