[rtmpdump] r324 - in trunk: librtmp/rtmp.h rtmpdump.1 rtmpdump.1.html rtmpgw.8 rtmpgw.8.html
hyc
subversion at mplayerhq.hu
Wed Mar 10 12:36:26 CET 2010
Author: hyc
Date: Wed Mar 10 12:36:25 2010
New Revision: 324
Log:
Document rmtpt support
Modified:
trunk/librtmp/rtmp.h
trunk/rtmpdump.1
trunk/rtmpdump.1.html
trunk/rtmpgw.8
trunk/rtmpgw.8.html
Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h Wed Mar 10 11:56:34 2010 (r323)
+++ trunk/librtmp/rtmp.h Wed Mar 10 12:36:25 2010 (r324)
@@ -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
Modified: trunk/rtmpdump.1
==============================================================================
--- trunk/rtmpdump.1 Wed Mar 10 11:56:34 2010 (r323)
+++ trunk/rtmpdump.1 Wed Mar 10 12:36:25 2010 (r324)
@@ -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.
Modified: trunk/rtmpdump.1.html
==============================================================================
--- trunk/rtmpdump.1.html Wed Mar 10 11:56:34 2010 (r323)
+++ trunk/rtmpdump.1.html Wed Mar 10 12:36:25 2010 (r324)
@@ -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 UR
<dl compact><dt>
<b>−−protocol −l</b> <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>
Modified: trunk/rtmpgw.8
==============================================================================
--- trunk/rtmpgw.8 Wed Mar 10 11:56:34 2010 (r323)
+++ trunk/rtmpgw.8 Wed Mar 10 12:36:25 2010 (r324)
@@ -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.
Modified: trunk/rtmpgw.8.html
==============================================================================
--- trunk/rtmpgw.8.html Wed Mar 10 11:56:34 2010 (r323)
+++ trunk/rtmpgw.8.html Wed Mar 10 12:36:25 2010 (r324)
@@ -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 UR
<dl compact><dt>
<b>−−protocol −l</b> <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>
More information about the rtmpdump
mailing list