projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
ffmpeg
/
libavformat
/
network.c
diff --git
a/src/third_party/ffmpeg/libavformat/network.c
b/src/third_party/ffmpeg/libavformat/network.c
index
5e574e3
..
9f02ec6
100644
(file)
--- a/
src/third_party/ffmpeg/libavformat/network.c
+++ b/
src/third_party/ffmpeg/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)
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);
}
}
return AVERROR(ETIMEDOUT);
}
}