generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r

Browse Source 
This fixes builds on platforms without strtok_r (windows).

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-06-13 10:51:22 +03:00
parent af10feadc2
commit 0533868642
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/rtmpproto.c
View File

@ -115,7 +115,7 @@ static const uint8_t rtmp_server_key[] = {
static int rtmp_write_amf_data(URLContext *s, char *param, uint8_t **p) static int rtmp_write_amf_data(URLContext *s, char *param, uint8_t **p)
{ {
char *field, *value, *saveptr; char *field, *value;
char type; char type;
/* The type must be B for Boolean, N for number, S for string, O for /* The type must be B for Boolean, N for number, S for string, O for
@ -130,8 +130,12 @@ static int rtmp_write_amf_data(URLContext *s, char *param, uint8_t **p)
value = param + 2; value = param + 2;
} else if (param[0] == 'N' && param[1] && param[2] == ':') { } else if (param[0] == 'N' && param[1] && param[2] == ':') {
type = param[1]; type = param[1];
field = strtok_r(param + 3, ":", &saveptr); field = param + 3;
value = strtok_r(NULL, ":", &saveptr); value = strchr(field, ':');
if (!value)
goto fail;
*value = '\0';
value++;
if (!field || !value) if (!field || !value)
goto fail; goto fail;
@ -226,18 +230,27 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
ff_amf_write_object_end(&p); ff_amf_write_object_end(&p);
if (rt->conn) { if (rt->conn) {
char *param, *saveptr; char *param = rt->conn;
// Write arbitrary AMF data to the Connect message. // Write arbitrary AMF data to the Connect message.
param = strtok_r(rt->conn, " ", &saveptr);
while (param != NULL) { while (param != NULL) {
char *sep;
param += strspn(param, " ");
if (!*param)
break;
sep = strchr(param, ' ');
if (sep)
*sep = '\0';
if ((ret = rtmp_write_amf_data(s, param, &p)) < 0) { if ((ret = rtmp_write_amf_data(s, param, &p)) < 0) {
// Invalid AMF parameter. // Invalid AMF parameter.
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return ret; return ret;
} }
param = strtok_r(NULL, " ", &saveptr); if (sep)
param = sep + 1;
else
break;
} }
} }