-
Michael Niedermayer authored
* commit '1bd0bdcd': lavu: Add av_gettime_relative Conflicts: libavutil/time.c libavutil/time.h libavutil/version.h See: 0eec06edMerged-by: Michael Niedermayer <michaelni@gmx.at>
e96ca404
* commit '1bd0bdcd': lavu: Add av_gettime_relative Conflicts: libavutil/time.c libavutil/time.h libavutil/version.h See: 0eec06edMerged-by: Michael Niedermayer <michaelni@gmx.at>