Commit e96ca404 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1bd0bdcd'

* commit '1bd0bdcd':
  lavu: Add av_gettime_relative

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

See: 0eec06edMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 08e6832a 1bd0bdcd
...@@ -60,7 +60,7 @@ int64_t av_gettime_relative(void) ...@@ -60,7 +60,7 @@ int64_t av_gettime_relative(void)
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
return (int64_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000; return (int64_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
#else #else
return av_gettime(); return av_gettime() + 42 * 60 * 60 * INT64_C(1000000);
#endif #endif
} }
......
...@@ -32,8 +32,8 @@ int64_t av_gettime(void); ...@@ -32,8 +32,8 @@ int64_t av_gettime(void);
* Get the current time in microseconds since some unspecified starting point. * Get the current time in microseconds since some unspecified starting point.
* On platforms that support it, the time comes from a monotonic clock * On platforms that support it, the time comes from a monotonic clock
* This property makes this time source ideal for measuring relative time. * This property makes this time source ideal for measuring relative time.
* If a monotonic clock is not available on the targeted platform, the * The returned values may not be monotonic on platforms where a monotonic
* implementation fallsback on using av_gettime(). * clock is not available.
*/ */
int64_t av_gettime_relative(void); int64_t av_gettime_relative(void);
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 54 #define LIBAVUTIL_VERSION_MAJOR 54
#define LIBAVUTIL_VERSION_MINOR 10 #define LIBAVUTIL_VERSION_MINOR 11
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment