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:
bd0db4a
d2e56cf
)
Merge commit 'd2e56cf753a6c462041dee897d9d0c90f349988c'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:32:48 +0000
(22:32 +0100)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:32:48 +0000
(22:32 +0100)
* commit '
d2e56cf753a6c462041dee897d9d0c90f349988c
':
avconv: move flushing the queued frames to configure_filtergraph()
Noop, as its a fixup to a previously skipped commit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Trivial merge