On Tue, 17 Jul 2012, Samuel Pitoiset wrote:
--- Changelog | 1 + configure | 2 ++ doc/general.texi | 2 +- doc/protocols.texi | 7 +++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rtmp.h | 1 + libavformat/rtmpproto.c | 23 +++++++++++++++++++++++ libavformat/version.h | 2 +- 9 files changed, 38 insertions(+), 2 deletions(-)diff --git a/Changelog b/Changelog index de54213..d183a38 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version <next>: - TechSmith Screen Codec 2 decoder - AAC encoding via libfdk-aac - Microsoft Expression Encoder Screen decoder +- RTMPS protocol support version 0.8: diff --git a/configure b/configure index 9639147..18963ee 100755 --- a/configure +++ b/configure @@ -1543,6 +1543,8 @@ mmsh_protocol_select="http_protocol" mmst_protocol_deps="network" rtmp_protocol_deps="!librtmp_protocol" rtmp_protocol_select="tcp_protocol" +rtmps_protocol_deps="!librtmp_protocol" +rtmps_protocol_select="tls_protocol" rtmpt_protocol_deps="!librtmp_protocol" rtmpt_protocol_select="ffrtmphttp_protocol" rtp_protocol_select="udp_protocol" diff --git a/doc/general.texi b/doc/general.texi index 49a6b80..e0228cf 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 943287a..22f7fb4 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 a TLS/IP network.
Nobody talks about "TLS/IP" networks. Other than that, the patch looks good, will apply soon. // Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
