OSDN Git Service

Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 20:55:20 +0000 (21:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 20:55:27 +0000 (21:55 +0100)
commit36258f98299409666ab373d04699618e9662e367
tree38c972902b77e4ab1c6980464809325256a0f719
parentc603f22683d85ce45909582fe12cdb4753f9f616
parentec7fc7b7d1f00fb8725d7812a018aed2ad1af132
Merge remote-tracking branch 'cigaes/master'

* 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>