summaryrefslogtreecommitdiff
path: root/doc/protocols.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:33:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:37:57 +0200
commit5993b962691ae29b6563785d26ef2a19ffa97f4c (patch)
tree33e8dc6047626e995914cf5482099e9a7e27fbdb /doc/protocols.texi
parent159dfd26259dbfc6b221447c24ea14f0a659f6a0 (diff)
parentd175a5730b42166704b7262b33f4b780d9d92f60 (diff)
downloadffmpeg-5993b962691ae29b6563785d26ef2a19ffa97f4c.tar.gz
Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'
* commit 'd175a5730b42166704b7262b33f4b780d9d92f60': doc: Add an example on publishing over RTMP doc: Add librtmp to the section header for the librtmp specific details Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
-rw-r--r--doc/protocols.texi8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index dcd65e8aac..5c43f01198 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -474,6 +474,12 @@ For example to read with @command{ffplay} a multimedia resource named
ffplay rtmp://myserver/vod/sample
@end example
+To publish to a password protected server, passing the playpath and
+app names separately:
+@example
+ffmpeg -re -i <input> -f flv -rtmp_playpath some/long/path -rtmp_app long/app/name rtmp://username:password@@myserver/
+@end example
+
@section rtmpe
Encrypted Real-Time Messaging Protocol.
@@ -514,7 +520,7 @@ The Real-Time Messaging Protocol tunneled through HTTPS (RTMPTS) is used
for streaming multimedia content within HTTPS requests to traverse
firewalls.
-@section rtmp, rtmpe, rtmps, rtmpt, rtmpte
+@section librtmp rtmp, rtmpe, rtmps, rtmpt, rtmpte
Real-Time Messaging Protocol and its variants supported through
librtmp.