From patchwork Tue Jan 22 19:18:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fpi@gmx.ch X-Patchwork-Id: 11826 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 598E244D6C0 for ; Tue, 22 Jan 2019 21:23:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78D1B68AA2D; Tue, 22 Jan 2019 21:23:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A985668A8A0 for ; Tue, 22 Jan 2019 21:23:26 +0200 (EET) Received: from nb50334.elcaNet.local ([46.127.112.55]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MUDXS-1gcZfU1ypW-00QxP5; Tue, 22 Jan 2019 20:18:34 +0100 From: fpi@gmx.ch To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Jan 2019 19:18:33 +0000 Message-Id: <20190122191833.27072-1-fpi@gmx.ch> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:qE98g9w+MLm17g21TgKDurUgpSQ9z0CU56TGDoFoPUfZi+bycZf PxHnmn8KfVXbgmcTmdDNYRyWKd1ehqnZ/JLN8+5E+omScwFQmt6kkXGzXeRkKEvLgDZjtEX 9aITcXPvW6mE9uaf6hzNvjWA/diMGQ0CXOPvKdn4Udhk3H+MT5FA/tEsYpjjZtgA6wcbzU9 UUWfqofp+fZsFQyB/YX4w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Y0kwz9j1Z58=:9HskrE4hMjTvKVhKLMYgp/ PJssSENIyk27g/iG/VJmVmqv99OaamfxO103n+D3k1EOLVGBuFunaow0T8FFJdknSY7TanPkx 7FTc989KrYatSg4H4PaN0il4OQAlYbMFSC0p1qOs7PGM68tao1W/1pzpv75eMyVpKhkc7PToO mVo7B7MNjtLbCMlF3Fr3Gta6x8gx4BUMdZbByCmhooguei89YIclsWKGbk2qswSaCM67dJRE3 xIa3JosTLOCnlaueuxtGSMagZVer6WdiNHulNhQO/jn72Lj6LWPW+UuIXeMm2SFfZVNJhNAdt UAlwIOEwSFcA/bbYy7n8aQdN5XjBT/fAEDbvA43Ln6bP4xQbEyIaW3prh0lsqFTbfetMFiSp5 u2FCYNBgYdgQ91ldCJ7x20MTtCAWYeJBz6bRh104EnLsXSDmmSwZ//5yP8adhAd+ROMO+eCJJ 2W+lWMhKlzS2Lapgh7kXEvCo4arJOO5ACMvGmY13WeSDGQT/J/9ggzN8lMbvRHHwo8b/Z78j5 Tf64NT+o7nrVGq6wUyGOMgjDtiGGQlYhUBmNzHdfCr3dkIGXhnnpn8mc9uuv1KK9lhldLOSJh CG8tVEm++uaI+NDr6L6aJu+kgmxpwjQ0sVvB0wUPQFkidLT8XVu0/xax+mwY/jVxaIB05CtO8 LsGAWaUirkrssuigDB2F35BvxEZftImrQOZABJvSl6wJeXvwbQDduA+TFDQDdTlLOgycEx6hi VLM90/33h+/o+kxhY3HJCAY8X/EFeD5WsFFXeAhx5/CgmY67FBcz3T1zRoM2zGa8hjGfTg4MR SAXPcMhutj/Vr1fXL9sv+Gw17dUsWa1BBGi6199XGYtxewg/3TiYedm8YPRuJeIxVUgmhxQyh lKXFVVcFdYyAmG6DaZrAp8Ll+jsTMwxsit19Vo+qM= Subject: [FFmpeg-devel] [PATCH] Avoids duplicated slashes in the RTSP URL. Signed-off-by: Frederic Pillonel 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: Frederic Pillonel Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Frederic Pillonel --- libavformat/rtsp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ceb770a3a4..20f63e0e01 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -548,9 +548,10 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, NULL, NULL, 0, p); if (proto[0] == '\0') { /* relative control URL */ - if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') - av_strlcat(rtsp_st->control_url, "/", - sizeof(rtsp_st->control_url)); + if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/' && + (sizeof(p) > 0 && p[0]!='/')) + av_strlcat(rtsp_st->control_url, "/", + sizeof(rtsp_st->control_url)); av_strlcat(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); } else