* commit '11136726':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>