From patchwork Sat Jan 15 02:23:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp873580iog; Fri, 14 Jan 2022 18:24:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJygR2zcezsZ6m2vB0qjcidM8qCiKkgjNDgib4XLXvENgKkGsNfKtJMQX5AMzvTR9KcVm0pI X-Received: by 2002:a17:907:2d0c:: with SMTP id gs12mr9265691ejc.4.1642213451928; Fri, 14 Jan 2022 18:24:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642213451; cv=none; d=google.com; s=arc-20160816; b=pGT9M4jI6KIR4VEEx5JXDBuzptr1zSFokRAwLw7W431lrL5xqteJTkbylcEu5ytghp LDutQ5NhEwCSQAm1T5hHmPiWOQgpYQzQRN7/e+Om8qWTucibJ2Oed1uscv9hi1HGYDwD ROd1jtyTmT8alctn1jhnz2zDhqejGj+IB41srN9kS2Lu4v5d+jmfo52NHINcyYw9D5rb 7xPJ8uF+VL91T7efvOp9OvhhFz535aCMxsdUNvMHDAIZB24jtZzyB8IacdHJex2/VuxH J7ptMLaRs34JNOvrE5uUmppgbuk3fVlocpIoD0JWKQO9cHFfhIsN2xrAe27660Ur0kzT ApWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:from:message-id :dkim-signature:delivered-to; bh=tUiYxuhA70XYJo6kBgiyD+9QckYKliz8ru0PsIEGm0M=; b=sdworA9M1JaEIYxfj40Py8+TrdqcHhj/+5XjfqExAAE2UI3nlN/jcFiSajs+zTQWzq m6Jo16WYI4Z1zkyvjYP65zvIxoJ8HgAQrlFgFI4QMxuyOn41YCubwnMFJWQhdkSxxk+N pOPHUkhl5QfdjpZg7DVvIu44HF29golRF98yXz3UgcaKRN0gf17TLUGaiExaYpo7LRxC EnwjKj8G+KsptjX7KNmIRRJZuTR4UlZIvCjqrqhXFY0ooHIzvmtbskfVgCeYpi+DfzV1 /R5QwhOFr1D23SEtG1H7dzJReX1+vDeOvFDXB7c1OX2xp3SFl5JNMMyC2mpiZzfKUcIk RraA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mBn+9ebj; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sg35si3967406ejc.892.2022.01.14.18.24.10; Fri, 14 Jan 2022 18:24:11 -0800 (PST) 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 header.s=20210112 header.b=mBn+9ebj; 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=QUARANTINE 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 205A268B3E5; Sat, 15 Jan 2022 04:24:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B509968B3C2 for ; Sat, 15 Jan 2022 04:23:59 +0200 (EET) Received: by mail-pf1-f179.google.com with SMTP id m21so4369351pfd.3 for ; Fri, 14 Jan 2022 18:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:from:date:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=u/pIGyhPRfH+TqoGyXB5pe+RPJKelf9olIqR9rXNWtg=; b=mBn+9ebjV5S6rH7rSoErChcbJQPmbd2g1D7UIdSRyiNUBxv+MJrQ8BKkI+dstEVCmY KzB0e7x4clWShbtIKVNQIsvbqbh9xA1BABtrDGMRmW32u0Huyc91red+73nIWBGXfBX8 25Yfojg4WUr+uJdUxW6UzR2bYYT3KgRjX3bDItpB6lG+T+/k5Dis8mdjaYFkZefX9ye3 FkmaFUqnnoqwJ0ymXFsEdCSyhtZ5XBYMS1TY7dnKjTjCa0zKzBmfYCcI6f/ebG8SpwD7 zh1BTnmDowQQ21gHY74f+feyb0nMrW3/PGa+K+b0NlMufM1gCKrN2FKxrZkc2mcFGEsG SOzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=u/pIGyhPRfH+TqoGyXB5pe+RPJKelf9olIqR9rXNWtg=; b=kC0QxVBHJqOUeGYmfnqe0tm55oPpPIyEzbUU/heeNw5EOTdsGzJfsVNZusuZVMv2Qt 85/rHxnX9ZOEaQx7yTN0qK5xt7etr1GklFdUgMcEE6vO2ogsce+kmR9Wk0l7oOApgtvM JG4w5U6NVGsqSmo+cUOQPyfYZXCEHh1Au+KVf7q1yGW5oG3gcJotbWa21Q9Az/eZttJm qjYbDr6C2iYW+a9drRdqveIZQxY5eiyBH++5Uep8evO7y/cJi5vshdyaYPbqqk9Y3g8o 2pUDHokeTfoTN4CRQs6nSqFLhvHs+u63qit39KCLNiJsmceWG1HQhmqi10S5Ie+TbcPV 9p8A== X-Gm-Message-State: AOAM531AZLeaRshnJR28uFUPP5aXzdPPoqjXT2cjbGgZ7HZVuNL7dL3e T65HoMWn13D5+fYW2sKiHPLoK0Ms68sk9g== X-Received: by 2002:a63:6a06:: with SMTP id f6mr10229320pgc.523.1642213437921; Fri, 14 Jan 2022 18:23:57 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id t4sm6229510pjr.24.2022.01.14.18.23.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 18:23:57 -0800 (PST) Message-Id: From: ffmpegagent Date: Sat, 15 Jan 2022 02:23:56 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: Fix path handling on Windows X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8wn4hW61XsMD From: softworkz Signed-off-by: softworkz --- avformat/hlsenc: Fix path handling on Windows Handling for DOS path separators was missing Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-19%2Fsoftworkz%2Fsubmit_hlspath-v1 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-19/softworkz/submit_hlspath-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/19 libavformat/hlsenc.c | 4 ++++ 1 file changed, 4 insertions(+) base-commit: c936c319bd54f097cc1d75b1ee1c407d53215d71 diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ef8973cea1..eff7f4212e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3028,6 +3028,10 @@ static int hls_init(AVFormatContext *s) } p = strrchr(vs->m3u8_name, '/'); +#if HAVE_DOS_PATHS + p = FFMAX(p, strrchr(vs->m3u8_name, '\\')); +#endif + if (p) { char tmp = *(++p); *p = '\0';