diff options
| author | Michael Niedermayer | 2012-07-23 21:04:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-07-23 21:25:09 +0200 |
| commit | 2cb4d516549526b5e17e941f6d2375a2c501ade6 (patch) | |
| tree | f472c62e0b34c2faaa955d51874cddb6be759910 /doc | |
| parent | 7e15df7551cf45ad1d3e39d20fdc8d6c651d4705 (diff) | |
| parent | d04c5293ce88927ad359ca276e287bfa63c2329d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Implement explode mode support
zerocodec: fix direct rendering.
wav: init st to NULL to avoid a false-positive warning.
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
h264: refactor NAL decode loop
RTMPTE protocol support
RTMPE protocol support
rtmp: Add ff_rtmp_calc_digest_pos()
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
swscale: add missing HAVE_INLINE_ASM check.
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
vc1: Add a test for interlaced field pictures
swscale: Mark all init functions as av_cold
swscale: x86: Drop pointless _mmx suffix from filenames
lavf: use conditional notation for default codec in muxer declarations.
swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
dsputil: ppc: cosmetics: pretty-print
dsputil: x86: add SHUFFLE_MASK_W macro
configure: respect CC_O setting in check_cc
Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 4 | ||||
| -rw-r--r-- | doc/protocols.texi | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 370765e9b2..95cf091fa0 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -904,10 +904,10 @@ 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 +@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 c68cd7ecab..1d24ee795b 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -277,6 +277,15 @@ For example to read with @command{ffplay} a multimedia resource named ffplay 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. @@ -292,6 +301,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. |