summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2012-08-07 22:02:27 +0200
committerMartin Storsjö <martin@martin.st>2012-08-07 23:35:39 +0300
commit00cb52c65cb2913f20dd3d0e6601d1b0db0b657b (patch)
treed3f2f41d3bb2cfb99cdb33fbaec568e824c26269 /doc
parentf9e77c1762c6904828550326dbbb2b36905eca1a (diff)
downloadffmpeg-00cb52c65cb2913f20dd3d0e6601d1b0db0b657b.tar.gz
rtmp: Add a new option 'rtmp_subscribe'
This option specifies the name of live stream to subscribe. Defaults to rtmp_playpath. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
-rw-r--r--doc/protocols.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index ff872fcdca..bf67d89ad3 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -237,6 +237,11 @@ value will be sent.
Stream identifier to play or to publish. This option overrides the
parameter specified in the URI.
+@item rtmp_subscribe
+Name of live stream to subscribe to. By default no value will be sent.
+It is only sent if the option is specified or if rtmp_live
+is set to live.
+
@item rtmp_swfurl
URL of the SWF player for the media. By default no value will be sent.