* commit '6d592fbd':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
	ffmpeg_filter.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>