aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:24:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:24:14 +0200
commit78242e431028de946cdd5c17dfbf95b0f187e507 (patch)
tree3dd9230b67ca0232bbbb34858c5c7c459a0e628a /doc
parent6c7a05352f5e941a5cfb371d9b8c9a414194dbef (diff)
parentaa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec (diff)
downloadffmpeg-78242e431028de946cdd5c17dfbf95b0f187e507.tar.gz
Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'
* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec': doc: Extend the rtmp example to include how to pass username/password Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/protocols.texi8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index e2738592a7..777d9e1a26 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -361,12 +361,18 @@ content across a TCP/IP network.
The required syntax is:
@example
-rtmp://@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}]
+rtmp://[@var{username}:@var{password}@@]@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}]
@end example
The accepted parameters are:
@table @option
+@item username
+An optional username (mostly for publishing).
+
+@item password
+An optional password (mostly for publishing).
+
@item server
The address of the RTMP server.