diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:04:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:06:56 +0200 |
| commit | e96ca404eae87e242b0ec0ca52897e9e135f8780 (patch) | |
| tree | 74ccc8e37900294406d386e9270f11e9214d6ffb | |
| parent | 08e6832a94cc1de441625f7834db739d131e23a6 (diff) | |
| parent | 1bd0bdcdc236099d5c0d179696951f35f5310fa5 (diff) | |
| download | ffmpeg-e96ca404eae87e242b0ec0ca52897e9e135f8780.tar.gz | |
Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'
* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
lavu: Add av_gettime_relative
Conflicts:
libavutil/time.c
libavutil/time.h
libavutil/version.h
See: 0eec06ed8747923faa6a98e474f224d922dc487d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/time.c | 2 | ||||
| -rw-r--r-- | libavutil/time.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/time.c b/libavutil/time.c index ce4552e767..dbaee0264c 100644 --- a/libavutil/time.c +++ b/libavutil/time.c @@ -60,7 +60,7 @@ int64_t av_gettime_relative(void) clock_gettime(CLOCK_MONOTONIC, &ts); return (int64_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000; #else - return av_gettime(); + return av_gettime() + 42 * 60 * 60 * INT64_C(1000000); #endif } diff --git a/libavutil/time.h b/libavutil/time.h index 910d28e85f..dc169b064a 100644 --- a/libavutil/time.h +++ b/libavutil/time.h @@ -32,8 +32,8 @@ int64_t av_gettime(void); * Get the current time in microseconds since some unspecified starting point. * On platforms that support it, the time comes from a monotonic clock * This property makes this time source ideal for measuring relative time. - * If a monotonic clock is not available on the targeted platform, the - * implementation fallsback on using av_gettime(). + * The returned values may not be monotonic on platforms where a monotonic + * clock is not available. */ int64_t av_gettime_relative(void); diff --git a/libavutil/version.h b/libavutil/version.h index 6db2dd7096..a682c806ca 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MINOR 11 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |