Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Langlois <olivier@trillion01.com>2014-05-07 01:16:51 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-17 22:13:33 +0400
commitf78bc96b7c1c74caf99a7139cf81ce1110404965 (patch)
treef160505f5f94cc30a1ce0f04fb643f82563470d4 /libavformat/network.c
parent9986e50a6ec8b4500557c3b17188615558a76069 (diff)
lavf: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.c')
-rw-r--r--libavformat/network.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/network.c b/libavformat/network.c
index 5e574e3bbe..9f02ec6c51 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -163,8 +163,8 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt
return ret;
if (timeout > 0) {
if (!wait_start)
- wait_start = av_gettime();
- else if (av_gettime() - wait_start > timeout)
+ wait_start = av_gettime_relative();
+ else if (av_gettime_relative() - wait_start > timeout)
return AVERROR(ETIMEDOUT);
}
}