diff options
| author | Ricardo Constantino <wiiaboo@gmail.com> | 2017-03-20 20:28:09 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2017-03-26 13:29:56 +0300 |
| commit | d4f3c26b700ae847433ba3c67dc99c32bc1fd4a1 (patch) | |
| tree | 7179b0269ea84cad8a53f39eb332b9e6c1872b66 | |
| parent | d6390090c4dbd766b77353553d9cb4fb4fb41ebd (diff) | |
| download | ffmpeg-d4f3c26b700ae847433ba3c67dc99c32bc1fd4a1.tar.gz | |
rtmpproto: send swfverify value as swfurl if latter is unused
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>
| -rw-r--r-- | libavformat/rtmpproto.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 7d40227632..115c335974 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -339,9 +339,12 @@ static int gen_connect(URLContext *s, RTMPContext *rt) ff_amf_write_field_name(&p, "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_string(&p, rt->swfurl); + if (rt->swfurl) + ff_amf_write_string(&p, rt->swfurl); + else + ff_amf_write_string(&p, rt->swfverify); } ff_amf_write_field_name(&p, "tcUrl"); |