generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-07-25 22:00:06 +02:00
parent 9746f87f15 758377a2b7
commit f7d4e26c6a
6 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/protocols.texi
View File

@@ -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