summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2012-07-20 16:36:47 +0200
committerMartin Storsjö <martin@martin.st>2012-07-23 16:32:09 +0300
commit08cd95e8a37674401ed24e5e6f4f7402edb7fdeb (patch)
tree3b0c2a52c4f70859b9a72ecab74f781d4a092f65 /doc
parentacd554c103459ae7a5d89caa611e91bbc9bf695f (diff)
downloadffmpeg-08cd95e8a37674401ed24e5e6f4f7402edb7fdeb.tar.gz
RTMPTE protocol support
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi2
-rw-r--r--doc/protocols.texi8
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index c54ac00125..05855542bf 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -847,7 +847,7 @@ performance on systems without hardware floating point support).
@item RTMPE @tab X
@item RTMPS @tab X
@item RTMPT @tab X
-@item RTMPTE @tab E
+@item RTMPTE @tab X
@item RTMPTS @tab X
@item RTP @tab X
@item SCTP @tab X
diff --git a/doc/protocols.texi b/doc/protocols.texi
index fcb4da801e..7b84f25815 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -271,6 +271,14 @@ The Real-Time Messaging Protocol tunneled through HTTP (RTMPT) is used
for streaming multimedia content within HTTP requests to traverse
firewalls.
+@section rtmpte
+
+Encrypted Real-Time Messaging Protocol tunneled through HTTP.
+
+The Encrypted Real-Time Messaging Protocol tunneled through HTTP (RTMPTE)
+is used for streaming multimedia content within HTTP requests to traverse
+firewalls.
+
@section rtmpts
Real-Time Messaging Protocol tunneled through HTTPS.