Michael Niedermayer e96ca404ea Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5' ...

* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
  lavu: Add av_gettime_relative

Conflicts:
	libavutil/time.c
	libavutil/time.h
	libavutil/version.h

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

2014-10-24 11:06:56 +02:00

1.8 KiB

Raw Blame History

View Raw