Module: libav
Branch: master
Commit: d4f3c26b700ae847433ba3c67dc99c32bc1fd4a1
Author: Ricardo Constantino <wiia...@gmail.com>
Committer: Martin Storsjö <mar...@martin.st>
Date: Mon Mar 20 20:28:09 2017 +0000
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ö <mar...@martin.st>
---
libavformat/rtmpproto.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 7d40227..115c335 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");
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
