Permalink
Browse files

Regenerate HTML docs, minor tweaks

  • Loading branch information...
1 parent dc762e4 commit a2fb387404cb0da99cf439d58478fff701398700 Howard Chu committed Jul 22, 2011
Showing with 33 additions and 14 deletions.
  1. +8 −2 librtmp/librtmp.3.html
  2. +3 −3 librtmp/rtmp.c
  3. +9 −2 rtmpdump.1.html
  4. +3 −3 rtmpdump.c
  5. +9 −2 rtmpgw.8.html
  6. +1 −1 rtmpgw.c
  7. +0 −1 rtmpsrv.c
View
@@ -6,10 +6,10 @@
<tr><td>LIBRTMP(3)<td align="center"><td align="right">LIBRTMP(3)
</thead>
<tfoot>
-<tr><td>RTMPDump v2.3<td align="center">2010-07-03<td align="right">LIBRTMP(3)
+<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">LIBRTMP(3)
</tfoot>
<tbody><tr><td colspan="3"><br><br><ul>
-<!-- Copyright 2010 Howard Chu.
+<!-- Copyright 2011 Howard Chu.
Copying permitted according to the GNU General Public License V2.-->
</ul>
@@ -238,6 +238,12 @@
</dl>
<p>
<dl compact><dt>
+<b>jtv=</b><i>JSON</i>
+<dd>
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
+</dl>
+<p>
+<dl compact><dt>
<b>swfVfy=</b><i>0|1</i>
<dd>
If the value is 1 or TRUE, the SWF player is retrieved from the
View
@@ -484,7 +484,7 @@ static struct urlopt {
{ AVC("subscribe"), OFF(Link.subscribepath), OPT_STR, 0,
"Stream to subscribe to" },
{ AVC("jtv"), OFF(Link.usherToken), OPT_STR, 0,
- "Justin.tv authentication token" },
+ "Justin.tv authentication token" },
{ AVC("token"), OFF(Link.token), OPT_STR, 0,
"Key for SecureToken response" },
{ AVC("swfVfy"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_SWFV,
@@ -1649,8 +1649,8 @@ SendFCSubscribe(RTMP *r, AVal *subscribepath)
return RTMP_SendPacket(r, &packet, TRUE);
}
-//Justin.tv specific authentication
-static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken"); //SAVC() isn't suitable for that
+/* Justin.tv specific authentication */
+static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken");
static int
SendUsherToken(RTMP *r, AVal *usherToken)
View
@@ -6,10 +6,10 @@
<tr><td>RTMPDUMP(1)<td align="center"><td align="right">RTMPDUMP(1)
</thead>
<tfoot>
-<tr><td>RTMPDump v2.2e<td align="center">2010-05-02<td align="right">RTMPDUMP(1)
+<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">RTMPDUMP(1)
</tfoot>
<tbody><tr><td colspan="3"><br><br><ul>
-<!-- Copyright 2010 Howard Chu.
+<!-- Copyright 2011 Howard Chu.
Copying permitted according to the GNU General Public License V2.-->
</ul>
@@ -42,6 +42,7 @@
[<b>&minus;b</b><i>&nbsp;buffer</i>]
[<b>&minus;m</b><i>&nbsp;timeout</i>]
[<b>&minus;T</b><i>&nbsp;key</i>]
+[<b>&minus;j</b><i>&nbsp;JSON</i>]
[<b>&minus;w</b><i>&nbsp;swfHash</i>]
[<b>&minus;x</b><i>&nbsp;swfSize</i>]
[<b>&minus;W</b><i>&nbsp;swfUrl</i>]
@@ -275,6 +276,12 @@
</dl>
<p>
<dl compact><dt>
+<b>&minus;&minus;jtv &minus;j</b>&nbsp;<i>JSON</i>
+<dd>
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
+</dl>
+<p>
+<dl compact><dt>
<b>&minus;&minus;swfhash &minus;w</b>&nbsp;<i>hexstring</i>
<dd>
SHA256 hash of the decompressed SWF file. This option may be needed if
View
@@ -1055,9 +1055,9 @@ main(int argc, char **argv)
case 'S':
STR2AVAL(sockshost, optarg);
break;
- case 'j':
- STR2AVAL(usherToken, optarg);
- break;
+ case 'j':
+ STR2AVAL(usherToken, optarg);
+ break;
default:
RTMP_LogPrintf("unknown option: %c\n", opt);
usage(argv[0]);
View
@@ -6,10 +6,10 @@
<tr><td>RTMPGW(8)<td align="center"><td align="right">RTMPGW(8)
</thead>
<tfoot>
-<tr><td>RTMPDump v2.2e<td align="center">2010-05-02<td align="right">RTMPGW(8)
+<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">RTMPGW(8)
</tfoot>
<tbody><tr><td colspan="3"><br><br><ul>
-<!-- Copyright 2010 Howard Chu.
+<!-- Copyright 2011 Howard Chu.
Copying permitted according to the GNU General Public License V2.-->
</ul>
@@ -41,6 +41,7 @@
[<b>&minus;b</b><i>&nbsp;buffer</i>]
[<b>&minus;m</b><i>&nbsp;timeout</i>]
[<b>&minus;T</b><i>&nbsp;key</i>]
+[<b>&minus;j</b><i>&nbsp;JSON</i>]
[<b>&minus;w</b><i>&nbsp;swfHash</i>]
[<b>&minus;x</b><i>&nbsp;swfSize</i>]
[<b>&minus;W</b><i>&nbsp;swfUrl</i>]
@@ -249,6 +250,12 @@
</dl>
<p>
<dl compact><dt>
+<b>&minus;&minus;jtv &minus;j</b>&nbsp;<i>JSON</i>
+<dd>
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
+</dl>
+<p>
+<dl compact><dt>
<b>&minus;&minus;swfhash &minus;w</b>&nbsp;<i>hexstring</i>
<dd>
SHA256 hash of the decompressed SWF file. This option may be needed if
View
@@ -1100,7 +1100,7 @@ main(int argc, char **argv)
("--stop|-B num Stop at num seconds into stream\n");
RTMP_LogPrintf
("--token|-T key Key for SecureToken response\n");
- RTMP_LogPrintf
+ RTMP_LogPrintf
("--jtv|-j JSON Authentication token for Justin.tv legacy servers\n");
RTMP_LogPrintf
("--buffer|-b Buffer time in milliseconds (default: %lu)\n\n",
View
@@ -116,7 +116,6 @@ typedef struct
AVal swfHash;
AVal flashVer;
AVal subscribepath;
- AVal usherToken;
uint32_t swfSize;
uint32_t dStartOffset;

0 comments on commit a2fb387

Please sign in to comment.