From d4f3c26b700ae847433ba3c67dc99c32bc1fd4a1 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Mon, 20 Mar 2017 20:28:09 +0000 Subject: [PATCH] rtmpproto: send swfverify value as swfurl if latter is unused MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replicates lavf/librtmp.c behavior in L145-152 and rtmpdump's behavior with "--swfVfy " passing the url to swfUrl. Fixes bug 943. Signed-off-by: Martin Storsjö --- libavformat/rtmpproto.c | 7 +++++-- 1 file 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");