diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 02:50:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 02:50:13 +0200 |
| commit | c88caa522c41cd4108d39d8dd98805e867606ae3 (patch) | |
| tree | 90eacfa0065bb907cd6543f5b2865d31d3d0a677 /doc/protocols.texi | |
| parent | db95e559f2b1c392295b09e8457d6f161eb5acdb (diff) | |
| parent | a2031251c7eedd0d82cb9e08717990fa2ae6299f (diff) | |
| download | ffmpeg-c88caa522c41cd4108d39d8dd98805e867606ae3.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
proto: include os_support.h in network.h
matroskaenc: don't write an empty Cues element.
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
avio: move extern url_interrupt_cb declaration from avio.h to url.h
avio: make av_register_protocol2 internal.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
proto: introduce listen option in tcp
doc: clarify configure features
proto: factor ff_network_wait_fd and use it on udp
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 3c57129ce0..a71c262368 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -402,6 +402,23 @@ ffplay sap://[ff0e::2:7ffe] Trasmission Control Protocol. +The required syntax for a TCP url is: +@example +tcp://@var{hostname}:@var{port}[?@var{options}] +@end example + +@table @option + +@item listen +Listen for an incoming connection + +@example +ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen +ffplay tcp://@var{hostname}:@var{port} +@end example + +@end table + @section udp User Datagram Protocol. |