[FFmpeg-cvslog] ff_network_wait_fd_timeout: do not break with timeout < 0
Michael Niedermayer
git at videolan.org
Sat Jul 6 01:44:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 6 01:31:37 2013 +0200| [efa9e6b4234534682bf7e4629c2e8024e35c64f2] | committer: Michael Niedermayer
ff_network_wait_fd_timeout: do not break with timeout < 0
Most code treats timeout < 0 like 0 already
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efa9e6b4234534682bf7e4629c2e8024e35c64f2
---
libavformat/network.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/network.c b/libavformat/network.c
index 8cffd68..55392af 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -162,7 +162,7 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt
return ret;
if (ff_check_interrupt(int_cb))
return AVERROR_EXIT;
- if (timeout) {
+ if (timeout > 0) {
if (!wait_start)
wait_start = av_gettime();
else if (av_gettime() - wait_start > timeout)
More information about the ffmpeg-cvslog
mailing list