Michael Niedermayer 4fde705396 Merge commit '111367263af41c88a44bd763ceefc11d53a7f655' ...

* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h

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

2013-04-12 00:44:18 +02:00

60 KiB

Raw Blame History

View Raw