From patchwork Sun Nov 11 12:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Dawkins X-Patchwork-Id: 10979 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 29A7E44D3D3 for ; Sun, 11 Nov 2018 14:07:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9076068990C; Sun, 11 Nov 2018 14:07:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E7016882C3 for ; Sun, 11 Nov 2018 14:07:10 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id 124-v6so5903380wmw.0 for ; Sun, 11 Nov 2018 04:07:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=QaFhKeR6++QbCmv494KCgi0F3OPbuFnyZXc6ACRcoP8=; b=J13JkPL4C4bu31bIMIxX81IY0PaI++4pegRXyoFbqqDwrgcKghYPO9CHIYvpbwi7cW dsVHfyGsKoWUPECzkMkLWqrwOnYMndzJv73IKVTiHax3DgxC2Eg7w1fMYwmKjwpy/nK1 JU+lCh55Q/+Xyv1nuAe7rN3z4ZsXrxodSFTm1LXv9w3+BiLzRV9nXhozYeLhDqntJ7mV qWVTCgF2A95ZgkQCSxAiRb2icWtWeaEgFu7Gt4qQP9V35tekm2G8UJcnoT//4pfIehyw PONspITu+ArrlNSmhcqm82ntIudo5qzrGKNwORKR7h8jEHG5A1BDB1GgltV/Lwj8ws9m tMVQ== 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:mime-version :content-transfer-encoding; bh=QaFhKeR6++QbCmv494KCgi0F3OPbuFnyZXc6ACRcoP8=; b=ZovHJK17Y/XR7WZgwKmK/CVS/+6yP3pIwmd2UkDB9C6dT5pCN7pP8uAt/UhonFgUe6 41zTwTlzrc7nqzejCBpa+0tK3tsFHRPjMI07HkMqWQ33XyTx+NiU2sYnhYehsJLvv7tl HYjqtdnFirFpXf/SBwtJf/7QxwObX+oOgax1DGWJ8Vg/00Dh4UyRIYGn13dgQczkOoFd MDLwbZt/3oO7Czc6kq0OJPKgKlN293IekYqWiicDzAh2jRd1WKomPa1BBHkznxXlrkoG knQBPLpr9emxQZOu44obUlK7s7ewWyHkrKRMRIVbXz18qEFmmRnydX7xHxy52c9VO1Zr r/RA== X-Gm-Message-State: AGRZ1gLaqnITXFrO27G9936umK+OQShSyl2VWY391lfoduU0YXzmtJun Mq0k0kE+eg/UTJHahPfPcyNeeJ/Z X-Google-Smtp-Source: AJdET5fTGnUov8+RKBMP3DaBM9oCDORfPqyjbkZPDzY6SQxBuZ9MWcuQh+hh7FNbHkKb3GmcAT9qXg== X-Received: by 2002:a1c:4086:: with SMTP id n128-v6mr4957519wma.137.1541937607929; Sun, 11 Nov 2018 04:00:07 -0800 (PST) Received: from localhost.localdomain (cpc83579-brig19-2-0-cust93.3-3.cable.virginm.net. [82.27.88.94]) by smtp.gmail.com with ESMTPSA id z8-v6sm16492526wrr.94.2018.11.11.04.00.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Nov 2018 04:00:07 -0800 (PST) From: Stephen Dawkins To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Nov 2018 12:00:06 +0000 Message-Id: <20181111120006.30561-1-stephen.dawkins@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: removed specific filename format code for non-zero segment sizes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch removes some duplicate code in hls_start that prevents the usage of strftime base filenames in conjuction with hls_segment_size. Signed-off-by: Stephen Dawkins --- libavformat/hlsenc.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f8f060d065..4557951f0b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1468,19 +1468,6 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) return AVERROR(ENOMEM); ff_format_set_url(vtt_oc, new_name); } - } else if (c->max_seg_size > 0) { - char *filename = NULL; - if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else - vs->basename, 'd', vs->sequence) < 1) { -#endif - av_free(filename); - av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -strftime 1 with it\n", vs->basename); - return AVERROR(EINVAL); - } - ff_format_set_url(oc, filename); } else { if (c->use_localtime) { time_t now0;