RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

rtmpproto: send swfverify value as swfurl if latter is unused

Browse Source 
Replicates lavf/librtmp.c behavior in L145-152 and rtmpdump's
behavior with "--swfVfy <url>" passing the url to swfUrl.

Fixes bug 943.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Ricardo Constantino 2017-03-20 20:28:09 +00:00 committed by Martin Storsjö
parent d6390090c4
commit d4f3c26b70
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtmpproto.c
View File

@ -339,9 +339,12 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
ff_amf_write_field_name(&p, "flashVer"); ff_amf_write_field_name(&p, "flashVer");
ff_amf_write_string(&p, rt->flashver); ff_amf_write_string(&p, rt->flashver);
if (rt->swfurl) { if (rt->swfurl || rt->swfverify) {
ff_amf_write_field_name(&p, "swfUrl"); ff_amf_write_field_name(&p, "swfUrl");
if (rt->swfurl)
ff_amf_write_string(&p, rt->swfurl); ff_amf_write_string(&p, rt->swfurl);
else
ff_amf_write_string(&p, rt->swfverify);
} }
ff_amf_write_field_name(&p, "tcUrl"); ff_amf_write_field_name(&p, "tcUrl");