summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2012-07-19 14:13:58 +0200
committerMartin Storsjö <martin@martin.st>2012-07-23 16:32:07 +0300
commitacd554c103459ae7a5d89caa611e91bbc9bf695f (patch)
tree7e591295c7f7057bc6e8c3da4ef7d825611c868b /doc
parent0e31088b6c57e7d495deda0abaf5de5adb2c18fa (diff)
RTMPE protocol support
This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi2
-rw-r--r--doc/protocols.texi9
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index f5c62936b7..c54ac00125 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -844,7 +844,7 @@ performance on systems without hardware floating point support).
@item MMST @tab X
@item pipe @tab X
@item RTMP @tab X
-@item RTMPE @tab E
+@item RTMPE @tab X
@item RTMPS @tab X
@item RTMPT @tab X
@item RTMPTE @tab E
diff --git a/doc/protocols.texi b/doc/protocols.texi
index aad7184126..fcb4da801e 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -247,6 +247,15 @@ For example to read with @command{avplay} a multimedia resource named
avplay rtmp://myserver/vod/sample
@end example
+@section rtmpe
+
+Encrypted Real-Time Messaging Protocol.
+
+The Encrypted Real-Time Messaging Protocol (RTMPE) is used for
+streaming multimedia content within standard cryptographic primitives,
+consisting of Diffie-Hellman key exchange and HMACSHA256, generating
+a pair of RC4 keys.
+
@section rtmps
Real-Time Messaging Protocol over a secure SSL connection.