RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtmpproto: send swfverify value as swfurl if latter is unused 

Replicates lavf/librtmp.c behavior in L149-156 and rtmpdump's
behavior with "--swfVfy <url>" passing the url to swfUrl.

Fixes trac ticket #5549.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ricardo Constantino 2017-03-20 20:22:51 +00:00 committed by Michael Niedermayer
parent ea93b74074
commit c0b3781bf2
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

@ -341,9 +341,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");