diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
| commit | 56ae5926f739bd26a5aa4add98604b7cd3c2d6ca (patch) | |
| tree | bd21824c32a6018f28d2e3c2c1d810ad77a3d1c5 /doc/protocols.texi | |
| parent | d4838675253513504c4e0d0ed92489b3c4e6cf8d (diff) | |
| parent | 453c02f971fc7865dea396731accbcd7ab6d3728 (diff) | |
| download | ffmpeg-56ae5926f739bd26a5aa4add98604b7cd3c2d6ca.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce encoding support
libopenjpeg: rename decoder source file.
RTMPTS protocol support
RTMPS protocol support
avconv: print an error message when demuxing fails.
tscc2: DCT output should not be clipped
rtmp: Rename rtmphttp to ffrtmphttp
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 75a5976270..dc5d5eb052 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -277,6 +277,13 @@ For example to read with @command{ffplay} a multimedia resource named ffplay 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. @@ -285,6 +292,14 @@ The Real-Time Messaging Protocol tunneled through HTTP (RTMPT) is used for streaming multimedia content within HTTP requests to traverse firewalls. +@section rtmpts + +Real-Time Messaging Protocol tunneled through HTTPS. + +The Real-Time Messaging Protocol tunneled through HTTPS (RTMPTS) is used +for streaming multimedia content within HTTPS requests to traverse +firewalls. + @section rtmp, rtmpe, rtmps, rtmpt, rtmpte Real-Time Messaging Protocol and its variants supported through |