[FFmpeg-cvslog] Merge remote-tracking branch 'cigaes/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 17 21:55:20 2013 +0100| [36258f98299409666ab373d04699618e9662e367] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36258f98299409666ab373d04699618e9662e367
---