* commit '6df9d9b5':
  lavf: Use av_gettime_relative

Conflicts:
	libavformat/hls.c

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