* commit 'c92965db':
  avconv: check return value

Conflicts:
	ffmpeg.c

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