From patchwork Wed Jan 23 08:11:48 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: 11835 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 6E96144D5C3 for ; Wed, 23 Jan 2019 10:17:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E2DC68AAE3; Wed, 23 Jan 2019 10:16:49 +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.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47D1368AA51 for ; Wed, 23 Jan 2019 10:16:43 +0200 (EET) Received: from nb50334.elcaNet.local ([194.230.158.11]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LsTge-1hAb5b2xT6-0121Lh; Wed, 23 Jan 2019 09:11:51 +0100 From: fpi@gmx.ch To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Jan 2019 08:11:48 +0000 Message-Id: <20190123081148.29388-1-fpi@gmx.ch> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:cxEOsu6kg2rIZ9fIrqU+BfnR/As383rUY7gxYbZ/t2RlzEM2Upr pXYsm47rN/rbXzWJLt9carOi7W+0xIsB+gAh+Ds0v6tWNrL5+0AE1mSXXPuaCflBmm3g4/g Unw+fHD0GZsTNWldPk5I9vkfrgP57PXus+ZLcJsJ572w2Knuhe5Hxp0Nh48fl0bXgedXU2K 3hM2vfxZlARfiXtbX96EQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:fZtXWWAnBwQ=:gI6SgiUDEEgOWGJC4lr/X4 /ae1tGqhzRwxOP4K1ZWZTu0JbLWIChtR2+hEHUwRvNKQ1eowitePH10iS12VaJ6IOb3aRJ4BF X06ndMeSSe7HKwKMbU7MQOcWnAijayUh+lSnIdJL/mYPIfLb7QC3WPZvrfnhguqy9JvzvSEdJ KB/v9fS6syPrykAjkFvkoJjSuiJEaz3oIGptVk6VKHpPGZKU/4dnY+pyVCcHUBRAzvfkeLkeh dB//Gab6ipde3u8WQVUtPwy8gI7El+G/aORXoaZ1IaJLcBW9iCiYu1UnP+ptK6O/jvlD34++z WLXAksL9lGca6jYT9k73tXM0TcF8J19JNsCyFSho+KP42ZZGFlppUV6LjiS6+OKbAbLuy9SSF cQVYnaL+JAgzHekrTNxS9ojedP4/q0eYWrh45Mw+BfGFeyMYD8cVrO0VXbnObjQ2TwBHPDzgY CBkdOTm6NKedX7RWYDB7P1BnCK8ef/cAx3hGXX6r6fhEVpCk/HGTZYVmM6G9cxo2mRYAiEZi7 7m4TpM2hLFEPhgqhIfY6Btff3EIORHk+etJrm+z//DoI//S4LMOpaPiYltIiD97xsGxsY6UPI 1NLcLzrt1pcao6y3EfFq28FkTybRg6YwB56Grfm7W9Tt3s2vat+TjhfYKNyhSw4dniEkW6PL6 um3e+9sSzG0tUg/I8MMcXtv0VXddmcIS8x4lzMLCs+c+Ysmm4OgxqZq4YNrax9Vyr9nCuNzhS f40KNlQR7YVucUOfwXpT1eSdSGrnJB5p0toVA6a+Gf3liY5og0oYKm44hdS0ZcZljhRCO187O nq26PBW3MCueZ+6OFGqe5UwYseHDEJpeYAJKh5Ujwiq31voojgcsQs6zKBV4Du5vCovBkPZd+ WkmaraEk3Xel2kp3HcyY46mDYuUeSOdePzTYaCYcI= Subject: [FFmpeg-devel] [PATCH] libavformat/rtsp.c: 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 ceb770a..3cc9012f 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]!='/' && + (strlen(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