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:
47eb15b
fb5518c
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:39 +0000
(15:44 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:45 +0000
(15:44 +0100)
* cehoyos/master:
Force one stream in caf muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge