Michael Niedermayer 46de9ba598 Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58' ...

* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
  lavfi: add avfilter_init_dict() for initializing a filter with a dict.

Conflicts:
	libavfilter/avfilter.c

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

2013-04-12 14:25:27 +02:00

60 KiB

Raw Blame History

View Raw