* commit 'c802a2e7':
  avconv: fix leak in filter error

Conflicts:
	ffmpeg_filter.c

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