aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-10-22 12:14:37 +0300
committerMartin Storsjö <martin@martin.st>2014-10-24 09:53:41 +0300
commit1bd0bdcdc236099d5c0d179696951f35f5310fa5 (patch)
tree491ea4c261e03afa7d471b6fc41abae621ec1420 /libavutil/version.h
parentaf7ca6ea124b82b337a6b96e10963e88eba57ebe (diff)
downloadffmpeg-1bd0bdcdc236099d5c0d179696951f35f5310fa5.tar.gz
lavu: Add av_gettime_relative
Since av_gettime() is used in a number of places where actual real time clock is required, the monotonic clock introduced in ebef9f5a5 would have consequences that are hard to handle. Instead split it into a separate function that can be used in the cases where only relative time is desired. On platform where no monotonic clock is available, the difference between the two av_gettime functions is not clear, and one could mistakenly use the relative clock where an absolute one is required. Therefore add an offset, to make it evident that the time returned from av_gettime_relative never is actual current real time, even though it is based on av_gettime. Based on a patch by Olivier Langlois. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r--libavutil/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 8279635a83..b40009e621 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR 4
+#define LIBAVUTIL_VERSION_MINOR 5
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \