Document rmtpt support

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@324 400ebc74-4327-4243-bc38-086b20814532

diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index 27be1e5359f2b1d04273cec50aecb3fb5ac565bd..d0b181785aa6743afe0b240e03b7aa391c89cc47 100644 (file)
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -60,7 +60,7 @@ extern "C"
 {
 #endif
 
-#define RTMP_FEATURE_HTTP      0x01    // not yet supported
+#define RTMP_FEATURE_HTTP      0x01
 #define RTMP_FEATURE_ENC       0x02
 #define RTMP_FEATURE_SSL       0x04
 #define RTMP_FEATURE_MFP       0x08    // not yet supported

diff --git a/rtmpdump.1 b/rtmpdump.1
index 1d7e455b3e14ddfbdf9f59b760bf1b51df1d1083..e91ca33f5a16ff42db02e093588de700841403a3 100644 (file)
--- a/rtmpdump.1
+++ b/rtmpdump.1
@@ -1,4 +1,4 @@
-.TH RTMPDUMP 1 "2010-03-04" "RTMPDump v2.2"
+.TH RTMPDUMP 1 "2010-03-10" "RTMPDump v2.2a"
 .\" Copyright 2010 Howard Chu.
 .\" Copying permitted according to the GNU General Public License V2.
 .SH NAME
@@ -78,14 +78,10 @@ specified by the given
 .IR url .
 The url should be of the form
 .nf
-  rtmp[e]://hostname[:port][/app[/playpath]]
+  rtmp[t][e]://hostname[:port][/app[/playpath]]
 .fi
 
-Both plaintext
-.I rtmp://
-and encrypted
-.I rtmpe://
-sessions are supported.
+Plain rtmp, as well as tunneled and encrypted sessions are supported.
 .SH OPTIONS
 .SS "Network Parameters"
 These options define how to connect to the media server.
@@ -100,7 +96,14 @@ Overrides the hostname in the RTMP URL.
 Overrides the port number in the RTMP URL.
 .TP
 \fB\-\-protocol        \-l\fP\ \fInumber\fP
-Overrides the protocol in the RTMP URL. 0 = rtmp, 2 = rtmpe
+Overrides the protocol in the RTMP URL.
+.nf
+  0 = rtmp
+  1 = rtmpt
+  2 = rtmpe
+  3 = rtmpte
+  5 = rtmps
+.fi
 .TP
 \fB\-\-socks           \-S\fP\ \fIhost:port\fP
 Use the specified SOCKS4 proxy.

diff --git a/rtmpdump.1.html b/rtmpdump.1.html
index 0b2a6e53e204ccec4ea0d932e251fb39b0cdb62a..69882d948b57174ddd37066315c90cd52c5717cf 100644 (file)
--- a/rtmpdump.1.html
+++ b/rtmpdump.1.html
@@ -6,7 +6,7 @@
 <tr><td>RTMPDUMP(1)<td align="center"><td align="right">RTMPDUMP(1)
 </thead>
 <tfoot>
-<tr><td>RTMPDump v2.2<td align="center">2010-03-04<td align="right">RTMPDUMP(1)
+<tr><td>RTMPDump v2.2a<td align="center">2010-03-10<td align="right">RTMPDUMP(1)
 </tfoot>
 <tbody><tr><td colspan="3"><br><br><ul>
 <!-- Copyright 2010 Howard Chu.
@@ -64,14 +64,10 @@ specified by the given
 <i>url</i>.
 The url should be of the form
 <pre>
-  rtmp[e]://hostname[:port][/app[/playpath]]
+  rtmp[t][e]://hostname[:port][/app[/playpath]]
 </pre>
 <p>
-Both plaintext
-<i>rtmp://</i>
-and encrypted
-<i>rtmpe://</i>
-sessions are supported.
+Plain rtmp, as well as tunneled and encrypted sessions are supported.
 </ul>
 
 <h3>OPTIONS</h3><ul>
@@ -101,7 +97,14 @@ Overrides the port number in the RTMP URL.
 <dl compact><dt>
 <b>&minus;&minus;protocol      &minus;l</b>&nbsp;<i>number</i>
 <dd>
-Overrides the protocol in the RTMP URL. 0 = rtmp, 2 = rtmpe
+Overrides the protocol in the RTMP URL.
+<pre>
+  0 = rtmp
+  1 = rtmpt
+  2 = rtmpe
+  3 = rtmpte
+  5 = rtmps
+</pre>
 </dl>
 <p>
 <dl compact><dt>

diff --git a/rtmpgw.8 b/rtmpgw.8
index fb31a678d27fb10234db452706f0ef3bad3a430e..84fabe42795c59a655f13b0d611294af99083b06 100644 (file)
--- a/rtmpgw.8
+++ b/rtmpgw.8
@@ -1,4 +1,4 @@
-.TH RTMPGW 8 "2010-03-04" "RTMPDump v2.2"
+.TH RTMPGW 8 "2010-03-10" "RTMPDump v2.2a"
 .\" Copyright 2010 Howard Chu.
 .\" Copying permitted according to the GNU General Public License V2.
 .SH NAME
@@ -94,7 +94,14 @@ Overrides the hostname in the RTMP URL.
 Overrides the port number in the RTMP URL.
 .TP
 \fB\-\-protocol        \-l\fP\ \fInumber\fP
-Overrides the protocol in the RTMP URL. 0 = rtmp, 2 = rtmpe
+Overrides the protocol in the RTMP URL.
+.nf
+  0 = rtmp
+  1 = rtmpt
+  2 = rtmpe
+  3 = rtmpte
+  5 = rtmps
+.fi
 .TP
 \fB\-\-socks           \-S\fP\ \fIhost:port\fP
 Use the specified SOCKS4 proxy.

diff --git a/rtmpgw.8.html b/rtmpgw.8.html
index 133a85b94c82b26ce9bd3e044beece775ceeead1..7f298350e41ea54e90587968103c49219b368171 100644 (file)
--- a/rtmpgw.8.html
+++ b/rtmpgw.8.html
@@ -6,7 +6,7 @@
 <tr><td>RTMPGW(8)<td align="center"><td align="right">RTMPGW(8)
 </thead>
 <tfoot>
-<tr><td>RTMPDump v2.2<td align="center">2010-03-04<td align="right">RTMPGW(8)
+<tr><td>RTMPDump v2.2a<td align="center">2010-03-10<td align="right">RTMPGW(8)
 </tfoot>
 <tbody><tr><td colspan="3"><br><br><ul>
 <!-- Copyright 2010 Howard Chu.
@@ -94,7 +94,14 @@ Overrides the port number in the RTMP URL.
 <dl compact><dt>
 <b>&minus;&minus;protocol      &minus;l</b>&nbsp;<i>number</i>
 <dd>
-Overrides the protocol in the RTMP URL. 0 = rtmp, 2 = rtmpe
+Overrides the protocol in the RTMP URL.
+<pre>
+  0 = rtmp
+  1 = rtmpt
+  2 = rtmpe
+  3 = rtmpte
+  5 = rtmps
+</pre>
 </dl>
 <p>
 <dl compact><dt>