From patchwork Tue Oct 17 22:11:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5614 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp679775jah; Tue, 17 Oct 2017 15:12:40 -0700 (PDT) X-Received: by 10.28.236.25 with SMTP id k25mr632974wmh.146.1508278360790; Tue, 17 Oct 2017 15:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508278360; cv=none; d=google.com; s=arc-20160816; b=pDMlzzmsG0+dL2I+uLZsCqGOAhtYimuCXw4KGmKP83rwpgY7pm+qQxQJ2Yho+cgt+A TIJOitI8Jy/eO3A7+3+bQfK1TAcAqesyHPHeTtx1ty4wlos0KbooEO/3+xOiv+JNPH+n YklIU16p2CWwwNHdmW1chN0hFm47vvxc2l+EmGm4ceXd0LyCOmadb/qQ6PN1v+bp013I 3WLUr0vzrf2mN4vYE8aIeqcDxlVVzhEoG3i0R9M6D96MRid0CpkA7PLOD9CgeCPPzNAq qtoG1tLDwDf+YFD+gtIpD/ptX0DTNQJ0rY+uEus/idiRCoBAGy/WCxZovhgcN26JhprL o12A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=gXNCrzri4/a3Mo6z8kwmYcnejxjoLaEthiaAcI5qtZk=; b=lvfnAb0yoLoLhI2P/T5TjZ4L6hA1OIg9TW/EEt6gbg4VZB398YyJJ1udNm31nE0ldE Oic6mMl+OYyZcH2xUAwHH6W5Zg9Z0Vnu/r3vI62dpPMTlCXOvvRwu5DuyxfIKLnXDfqj ZdRZIapztOquyUbYzR3DLoee6LJRzudpCSzEHFoqjqYpyGZQfBdjxNdfS3JWgUCMQNwK Q3tryIwlGt30vlK8ie6DlHSe+dezc+RxSwXPpOuyBXLwaX71sR3DQAxsqqv56DNUo2nq OPcK92b6ybOM68qmzWLgTZIcmpEhP0m7OpZi9PX3LP05+XgQrVvoBJuPgD7ypnW/e4np +1Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=r6XFTWoP; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q3si8428325wrd.153.2017.10.17.15.12.40; Tue, 17 Oct 2017 15:12:40 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=r6XFTWoP; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ED7C689FAE; Wed, 18 Oct 2017 01:12:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A118689888 for ; Wed, 18 Oct 2017 01:12:03 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id i124so6477075wmf.3 for ; Tue, 17 Oct 2017 15:12:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=03MIXevJepM6n/C3bkOXhm0U1feVt5rWY7uNLqhT3Js=; b=r6XFTWoPzxPBnzb57sil2e5+49gpCxeFhd1081H1G9wGJhoCPaMDsYpGp/A5abqBMs YndgqMKumF3lYtY41j6b+bpUGHAwX8UEyAQIOf/LHRwk5SiDlvgzhOj2U86DqcSTDd9Z Mt+GD2h1TI8gNM9cPSFvhFbax4muxDnswMsU5OyZQ3L70FXR1OxUeP80CVoTfyKtetfm 3eGTb/t7HjqHCpktjCqsnVbYXplNTgQNw2M2H6y/NTFio71NG0r32SOqkyEzE3V8D1ww x2+76p2YLfGb5Al/AE3HnPAKblDZ8K2b8S5X34H/wAl5HsPmk2Jwg+JutFX2nW/GLrMd wpeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=03MIXevJepM6n/C3bkOXhm0U1feVt5rWY7uNLqhT3Js=; b=PQljdAWlg5vAKjmrDhV1dj687R/Pq3v51krp+oukNV/VLf4Ju/W3/34OLGyJI2Gjqw geMgYcY00wP3e2EerEBOZ5Us3kaAQHqhiLHY3B+A/CshEeh2F2bLQJqaSoKkVa+8Zz6x hW06pa36X1LdndMzElmtPeIwe/edNxEY+Mpxvyk+bT+no6fsh5NdEKG3TbwMQ/+lbQ2R nZ5NpEdOVDGqXVENBB561j5SPRhH9HDdsq060CNEnuDZehZS/NxOYwLIZGYvdRqB0jCk tUOqJou/mHVOtGU8lZDf28PX8dAO7ptM91W6q8omDVBQ2xSOnmEXLn+pvMAC0S4JTAY+ ATlg== X-Gm-Message-State: AMCzsaVxI+7nlcP94RmGEDzemr57GXKcPg6gZFKRpwrYdaMORS4liciB jzjvTIcEK98T4cjIiU3TtJxhFNTc X-Google-Smtp-Source: ABhQp+QJZTtAooXQDz1Encb3D66TOKi7UFvggx1eyvA1/Rq9pAcoALqM7be2OEgYnLllqC2t1xEURA== X-Received: by 10.28.209.132 with SMTP id i126mr4368716wmg.65.1508278327629; Tue, 17 Oct 2017 15:12:07 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p77sm13063074wmd.28.2017.10.17.15.12.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 15:12:06 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 23:11:58 +0100 Message-Id: <20171017221159.2349-6-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017221159.2349-1-sw@jkqxz.net> References: <20171017221159.2349-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 6/7] hlsenc: Fix creation of final directory in path 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #6752. --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 418f153c6f..eba3aef567 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -207,7 +207,7 @@ static int mkdir_p(const char *path) { } } - if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) { + if ((*(pos - 1) != '/') && (*(pos - 1) != '\\')) { ret = mkdir(temp, 0755); }