* commit 'd0c09302':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

See: 76191c08Merged-by: Michael Niedermayer <michaelni@gmx.at>