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:
83bf40f
5fa255b
)
Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
author
James Almer
<jamrial@gmail.com>
Wed, 28 Sep 2016 15:57:58 +0000
(12:57 -0300)
committer
James Almer
<jamrial@gmail.com>
Wed, 28 Sep 2016 15:57:58 +0000
(12:57 -0300)
* commit '
5fa255b65c7887cc913f097aed1b581fbf1a8745
':
avconv: initialize output framerate earlier
Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.
Merged-by: James Almer <jamrial@gmail.com>
Trivial merge