diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-07-17 12:02:42 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-17 13:53:33 +0300 |
| commit | 6aedabc9b68cab7b65833415953e958ac2c77f80 (patch) | |
| tree | 1f0a7e897f9dba9dab14c56f85b15df3cd80f1ed /doc | |
| parent | 5417efbbf313781f5bac38daee95f62c671c5d63 (diff) | |
| download | ffmpeg-6aedabc9b68cab7b65833415953e958ac2c77f80.tar.gz | |
RTMPS protocol support
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | doc/protocols.texi | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 49a6b805f4..e0228cfaf9 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -844,7 +844,7 @@ performance on systems without hardware floating point support). @item pipe @tab X @item RTMP @tab X @item RTMPE @tab E -@item RTMPS @tab E +@item RTMPS @tab X @item RTMPT @tab X @item RTMPTE @tab E @item RTP @tab X diff --git a/doc/protocols.texi b/doc/protocols.texi index 943287aa9f..45918221f4 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -247,6 +247,13 @@ For example to read with @command{avplay} a multimedia resource named avplay rtmp://myserver/vod/sample @end example +@section rtmps + +Real-Time Messaging Protocol over a secure SSL connection. + +The Real-Time Messaging Protocol (RTMPS) is used for streaming +multimedia content across an encrypted connection. + @section rtmpt Real-Time Messaging Protocol tunneled through HTTP. |