From 00cb52c65cb2913f20dd3d0e6601d1b0db0b657b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Aug 2012 22:02:27 +0200 Subject: rtmp: Add a new option 'rtmp_subscribe' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This option specifies the name of live stream to subscribe. Defaults to rtmp_playpath. Signed-off-by: Martin Storsjö --- doc/protocols.texi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/protocols.texi b/doc/protocols.texi index ff872fc..bf67d89 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. -- cgit v1.1 From 578344f79c480507fe07303ce6ed75d45fe0dd26 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 7 Aug 2012 14:56:38 +0200 Subject: doc: cygwin: Update list of FATE package requirements --- doc/platform.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/platform.texi b/doc/platform.texi index 46e36c3..2049031f 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -287,9 +287,9 @@ following "Devel" ones: binutils, gcc4-core, make, git, mingw-runtime, texi2html @end example -And the following "Utils" one: +In order to run FATE you will also need the following "Utils" packages: @example -diffutils +bc, diffutils @end example Then run -- cgit v1.1