diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-25 22:00:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-25 22:00:06 +0200 |
| commit | f7d4e26c6a0a11c255e22994fabd97a4e62e3d01 (patch) | |
| tree | 65c18e3f9064ed481b0001beac05e194232260eb /doc | |
| parent | 9746f87f154029ed5866cbc02ba0d57f5b5c283f (diff) | |
| parent | 758377a2b79a35386978b0af1196d36cbcfb8f64 (diff) | |
| download | ffmpeg-f7d4e26c6a0a11c255e22994fabd97a4e62e3d01.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add a new option 'rtmp_pageurl'
doc: Update the description of the rtmp_tcurl option
rtmp: Make the description of the rtmp_tcurl option more generic
libfdk-aacenc: add LATM/LOAS encapsulation support
sctp: add port missing error message
tcp: add port missing error message
avfilter: Fix printf format string conversion specifier
Conflicts:
libavcodec/version.h
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 1d24ee795b..4833cd3395 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -259,6 +259,10 @@ playpath. If a live stream of that name is not found, it plays the recorded stream. The other possible values are @code{live} and @code{recorded}. +@item rtmp_pageurl +URL of the web page in which the media was embedded. By default no +value will be sent. + @item rtmp_playpath Stream identifier to play or to publish. This option overrides the parameter specified in the URI. @@ -267,7 +271,7 @@ parameter specified in the URI. URL of the SWF player for the media. By default no value will be sent. @item rtmp_tcurl -URL of the target stream. +URL of the target stream. Defaults to proto://host[:port]/app. @end table |