Michael Niedermayer 7381d31f22 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-28 11:02:01 +02:00

65 KiB

Raw Blame History

View Raw