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:
c603f22
ec7fc7b
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Mar 2013 20:55:20 +0000
(21:55 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Mar 2013 20:55:27 +0000
(21:55 +0100)
* cigaes/master:
fate: add a test for -filter_complex / -lavfi without input.
ffmpeg: make -lavfi an alias for -filter_complex.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge
OSDN Git Service
