projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05387b3
a8a1838
)
Merge pull request #8602 from alalek:ffmpeg_update
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000
(13:01 +0000)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000
(13:01 +0000)
Trivial merge