summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/protocols.texi3
-rw-r--r--libavformat/udp.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 883c2e46c1..0ad985c20a 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -694,6 +694,9 @@ packets with size of 188 bytes. If not specified defaults to 7*4096.
@item overrun_nonfatal=@var{1|0}
Survive in case of UDP receiving circular buffer overrun. Default
value is 0.
+
+@item timeout=@var{microseconds}
+In read mode: if no data arrived in more than this time interval, raise error.
@end table
Some usage examples of the UDP protocol with @command{ffmpeg} follow.
diff --git a/libavformat/udp.c b/libavformat/udp.c
index f93c607c35..c1973a030c 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -549,6 +549,8 @@ static int udp_open(URLContext *h, const char *uri, int flags)
break;
}
}
+ if (!is_output && av_find_info_tag(buf, sizeof(buf), "timeout", p))
+ h->rw_timeout = strtol(buf, NULL, 10);
}
/* fill the dest addr */