From a2fb387404cb0da99cf439d58478fff701398700 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 21 Jul 2011 17:31:14 -0700 Subject: [PATCH] Regenerate HTML docs, minor tweaks --- librtmp/librtmp.3.html | 10 ++++++++-- librtmp/rtmp.c | 6 +++--- rtmpdump.1.html | 11 +++++++++-- rtmpdump.c | 6 +++--- rtmpgw.8.html | 11 +++++++++-- rtmpgw.c | 2 +- rtmpsrv.c | 1 - 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/librtmp/librtmp.3.html b/librtmp/librtmp.3.html index e5e6f4b..6f59851 100644 --- a/librtmp/librtmp.3.html +++ b/librtmp/librtmp.3.html @@ -6,10 +6,10 @@ LIBRTMP(3)LIBRTMP(3) -RTMPDump v2.32010-07-03LIBRTMP(3) +RTMPDump v2.42011-07-20LIBRTMP(3)

@@ -238,6 +238,12 @@ authentication.

+jtv=JSON +
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken +
+

+

swfVfy=0|1
If the value is 1 or TRUE, the SWF player is retrieved from the diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index adcff1f..8d76164 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -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) diff --git a/rtmpdump.1.html b/rtmpdump.1.html index 7f17636..826f722 100644 --- a/rtmpdump.1.html +++ b/rtmpdump.1.html @@ -6,10 +6,10 @@ RTMPDUMP(1)RTMPDUMP(1) -RTMPDump v2.2e2010-05-02RTMPDUMP(1) +RTMPDump v2.42011-07-20RTMPDUMP(1)

    -
@@ -42,6 +42,7 @@ rtmpdump − RTMP streaming media client [−b buffer] [−m timeout] [−T key] +[−j JSON] [−w swfHash] [−x swfSize] [−W swfUrl] @@ -275,6 +276,12 @@ authentication.

+−−jtv −j JSON +
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken +
+

+

−−swfhash −w hexstring
SHA256 hash of the decompressed SWF file. This option may be needed if diff --git a/rtmpdump.c b/rtmpdump.c index ec1de85..89c053a 100644 --- a/rtmpdump.c +++ b/rtmpdump.c @@ -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]); diff --git a/rtmpgw.8.html b/rtmpgw.8.html index 58b8f35..68d6734 100644 --- a/rtmpgw.8.html +++ b/rtmpgw.8.html @@ -6,10 +6,10 @@ RTMPGW(8)RTMPGW(8) -RTMPDump v2.2e2010-05-02RTMPGW(8) +RTMPDump v2.42011-07-20RTMPGW(8)

    -
@@ -41,6 +41,7 @@ rtmpgw − RTMP streaming media gateway [−b buffer] [−m timeout] [−T key] +[−j JSON] [−w swfHash] [−x swfSize] [−W swfUrl] @@ -249,6 +250,12 @@ authentication.

+−−jtv −j JSON +
+JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken +
+

+

−−swfhash −w hexstring
SHA256 hash of the decompressed SWF file. This option may be needed if diff --git a/rtmpgw.c b/rtmpgw.c index ce7319a..733e105 100644 --- a/rtmpgw.c +++ b/rtmpgw.c @@ -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", diff --git a/rtmpsrv.c b/rtmpsrv.c index cf52bfa..f1b6c66 100644 --- a/rtmpsrv.c +++ b/rtmpsrv.c @@ -116,7 +116,6 @@ typedef struct AVal swfHash; AVal flashVer; AVal subscribepath; - AVal usherToken; uint32_t swfSize; uint32_t dStartOffset; -- 2.40.0