[FFmpeg-cvslog] doc: Add documentation for the newly added rtmp_* options

[Samuel Pitoiset]

ffmpeg | branch: master | Samuel Pitoiset <samuel.pitoiset at gmail.com> | Fri Jun  8 13:15:21 2012 +0200| [b4c92e94bbd640689a79a24ea887e79a43deaa32] | committer: Martin Storsjö

doc: Add documentation for the newly added rtmp_* options

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4c92e94bbd640689a79a24ea887e79a43deaa32
---

 doc/protocols.texi |   39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 172184e..c7baad4 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -179,11 +179,46 @@ The number of the TCP port to use (by default is 1935).
 @item app
 It is the name of the application to access. It usually corresponds to
 the path where the application is installed on the RTMP server
-(e.g. @file{/ondemand/}, @file{/flash/live/}, etc.).
+(e.g. @file{/ondemand/}, @file{/flash/live/}, etc.). You can override
+the value parsed from the URI through the @code{rtmp_app} option, too.
 
 @item playpath
 It is the path or name of the resource to play with reference to the
-application specified in @var{app}, may be prefixed by "mp4:".
+application specified in @var{app}, may be prefixed by "mp4:". You
+can override the value parsed from the URI through the @code{rtmp_playpath}
+option, too.
+
+ at end table
+
+Additionally, the following parameters can be set via command line options
+(or in code via @code{AVOption}s):
+ at table @option
+
+ at item rtmp_app
+Name of application to connect on the RTMP server. This option
+overrides the parameter specified in the URI.
+
+ at item rtmp_flashver
+Version of the Flash plugin used to run the SWF player. The default
+is LNX 9,0,124,2.
+
+ at item rtmp_live
+Specify that the media is a live stream. No resuming or seeking in
+live streams is possible. The default value is @code{any}, which means the
+subscriber first tries to play the live stream specified in the
+playpath. If a live stream of that name is not found, it plays the
+recorded stream. The other possible values are @code{live} and
+ at code{recorded}.
+
+ at item rtmp_playpath
+Stream identifier to play or to publish. This option overrides the
+parameter specified in the URI.
+
+ at item rtmp_swfurl
+URL of the SWF player for the media. By default no value will be sent.
+
+ at item rtmp_tcurl
+URL of the target stream.
 
 @end table