summaryrefslogtreecommitdiff
path: root/libavformat/rtmpproto.c
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-03-20 20:22:51 +0000
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-07 00:57:08 +0200
commitc0b3781bf2fef529d64af0e36ea84c0a34522367 (patch)
treea13062f8560dac3c7d797273d4e6aeae25245afd /libavformat/rtmpproto.c
parentea93b74074c509f59942c7ed4112ed3d64c3af33 (diff)
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>
Diffstat (limited to 'libavformat/rtmpproto.c')
-rw-r--r--libavformat/rtmpproto.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index d415f0fb20..ae55a33284 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -341,9 +341,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");