RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-10-24 11:04:52 +02:00
parent 08e6832a94 1bd0bdcdc2
commit e96ca404ea
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/time.c
View File

@ -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
}

4
libavutil/time.h
View File

@ -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);

2
libavutil/version.h
View File

@ -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, \