From patchwork Mon Mar 20 20:22:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Constantino X-Patchwork-Id: 3031 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1557446vsy; Mon, 20 Mar 2017 13:29:11 -0700 (PDT) X-Received: by 10.28.136.81 with SMTP id k78mr11648877wmd.36.1490041751503; Mon, 20 Mar 2017 13:29:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x133si16733417wme.3.2017.03.20.13.29.10; Mon, 20 Mar 2017 13:29:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07E4A6883A9; Mon, 20 Mar 2017 22:28:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2879868833D for ; Mon, 20 Mar 2017 22:28:44 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id g10so19860224wrg.0 for ; Mon, 20 Mar 2017 13:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rJA8mX8XPfxWnUF6uaOAsGc8j5OC93ky1BwSgtU+01o=; b=c6abN7GtfspgaoWIvm9r5bvuYWBqlg7L6OakC0PjwhGgBBrc7xnDnhlaBNAViNyDmc qwdkJbhoSxQedyxaMcpctJB+PSbNtt7TQooePHzREPkogz2INPcw8RAr5VO0kB4/Bndz fueRa1gr8Jt1QVGLh0N4dFQYek5Rf2J0dgzqw3G5mWq0XnAclCWV1DDACTEBLTNPf+pa g2NVwW3AYPAJUXd+QNR/Cckx4Zf7sMSExXYliPV3G5EDcWkhuuKHXj8Kd3QeXa42iltV RIFaqWj6AE21eyne6D6V8j3GO2y0bCN2Cj7MvA/E+MkjN++UxywxhAfAA5Qdid9qGrxc ThiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rJA8mX8XPfxWnUF6uaOAsGc8j5OC93ky1BwSgtU+01o=; b=iWgZDY5KEYTCOHoAJTtMlvqi01Uux3F6Fct0nJxHlLGOPzqeIiW9zCwftT/Dv0YvIr We5JI8OSBdxArliDpzVVEpWHBOBOQU6cZj8V9m8Ee2Xvqpl8ycobfvroUp8vUJgyn5FO XA/sxGD1cf1pyBkPwaDXeqjel1u94HdFuqarq7srofd/Ke7z3U4pMVZc7++Vy+S+uFKK lJeH4Aiuqdbw5JKUWX9CffrnA0N0WnPP04o9T+OnaVpLtnneXRy2HpwKrmL3ff+X5uZz n2uV82jT3ToPXOge8OKH1EKRBUf9Zh31jhJcctYyihRNwOlYZQm7m/X8bxGQYr90xQa0 UO4Q== X-Gm-Message-State: AFeK/H2l3RslUxjJpBKaMQUDO047JHcPhe0EReNKI9wPD4ToQVzhzDZ/8EWnMXF+Jvu2Lg== X-Received: by 10.223.173.199 with SMTP id w65mr27278491wrc.125.1490041384018; Mon, 20 Mar 2017 13:23:04 -0700 (PDT) Received: from localhost.localdomain (10.246.114.89.rev.vodafone.pt. [89.114.246.10]) by smtp.gmail.com with ESMTPSA id k76sm22028190wrc.12.2017.03.20.13.23.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Mar 2017 13:23:03 -0700 (PDT) From: Ricardo Constantino To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Mar 2017 20:22:51 +0000 Message-Id: <20170320202251.2864-1-wiiaboo@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [FFmpeg-devel] [PATCH] rtmpproto: send swfverify value as swfurl if latter is unused X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Ricardo Constantino MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Replicates lavf/librtmp.c behavior in L149-156 and rtmpdump's behavior with "--swfVfy " passing the url to swfUrl. Fixes trac ticket #5549. --- libavformat/rtmpproto.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 5d7ad795ed..cecb6b4d9f 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");