ffmpeg | branch: master | Ricardo Constantino <wiia...@gmail.com> | Mon Mar 20 20:22:51 2017 +0000| [c0b3781bf2fef529d64af0e36ea84c0a34522367] | committer: Michael Niedermayer
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 <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0b3781bf2fef529d64af0e36ea84c0a34522367 --- libavformat/rtmpproto.c | 7 +++++-- 1 file 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"); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
