git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 24 Oct 2014 10:40:08 +0000 (12:40 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 24 Oct 2014 10:40:36 +0000 (12:40 +0200)
commit	2c5ae57776907142b78243cbf502be6f5370ca87
tree	3e718a04eda5858347982e572c13e384d1c52a16	tree \| snapshot
parent	2896b981830ec5835732c044a2f6c606ee9fd5e6	commit \| diff
parent	6df9d9b55d3f56ee7782639a7678eeeaf77f14ea	commit \| diff

Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'

* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
lavf: Use av_gettime_relative

Conflicts:
libavformat/hls.c

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

FFmpeg git repo