Michael Niedermayer 2c5ae57776 Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' ...

* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
  lavf: Use av_gettime_relative

Conflicts:
	libavformat/hls.c

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

2014-10-24 12:40:36 +02:00

32 KiB

Raw Blame History

View Raw