diff options
| author | Andrey Utkin <andrey.krieger.utkin@gmail.com> | 2012-08-27 16:31:09 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 00:28:07 +0200 |
| commit | 028b6d2b5cf6a6dc593921c4ceab60a747eccf71 (patch) | |
| tree | 4a73652054605678acbc3685b323c0860a4e635e | |
| parent | 7870722592f58d4d1f5beeabfd11b6afc5285e76 (diff) | |
| download | ffmpeg-028b6d2b5cf6a6dc593921c4ceab60a747eccf71.tar.gz | |
Add 'timeout' option to UDP protocol
This patch accepts 'timeout' option for input mode only. As far as i know, UDP output cannot introduce delays.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/protocols.texi | 3 | ||||
| -rw-r--r-- | libavformat/udp.c | 2 |
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 */ |