[FFmpeg-cvslog] Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 12:40:08 2014 +0200| [2c5ae57776907142b78243cbf502be6f5370ca87] | committer: Michael Niedermayer

Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'

* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
  lavf: Use av_gettime_relative

Conflicts:
	libavformat/hls.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c5ae57776907142b78243cbf502be6f5370ca87
---