* commit '22a6d48b':
  avconv: Print the avfilter errors

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