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:
af9cac1
4426540
)
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:50:06 +0000
(18:50 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:50:11 +0000
(18:50 +0100)
This commit is a no-op. We will do this when we convert ffmpeg.c
* commit '
4426540f0c3ee516662f79d0a6ab5b95503b6611
':
avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge