From patchwork Tue Nov 7 01:03:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Johansen X-Patchwork-Id: 44541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7aa7:b0:181:818d:5e7f with SMTP id u39csp19618pzh; Mon, 6 Nov 2023 17:04:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGo1m8qtxVoPiMjcNjMmd5x1D5pPIFSihJM/Ort66JIPjJhsCdascezJtO5Xs2YQ6NjIihZ X-Received: by 2002:a17:907:3f85:b0:9ae:6a60:81a2 with SMTP id hr5-20020a1709073f8500b009ae6a6081a2mr14355513ejc.25.1699319049849; Mon, 06 Nov 2023 17:04:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699319049; cv=none; d=google.com; s=arc-20160816; b=BHCrJyk/AwDbzuEeOhUo+oryyk6WLuqdSaU2vJzOvwg4De+eGbZ1uctdV1Wd4egzoq wwBfkrkUE1jUUarJJdivSERVrnKf7DbThwZOHT4z3AQjhtdAimeqlvb6y1YWyVugkyLc WaacEK3O4iwXBE70YTI2HxqGvbDXNTOuLvaSXYrh7lQ6B6kgzquAR/hfOW2JTfGR2gcv +X2bT5aylYVTmVKMwxM5f0FRuYmD0+MFl1Qt4eJ6/2EgsHVI/bnJh/iWi2A5uCdzmuLB JdONB1CJGaI04g3APsUDNlAb+pSfl1S1zOTSSalRtmrsh9EIzdA9ehaSvj3dGthkqbbS lWMw== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=M9E5KXmakZNXv+Z/VRBMFwxybDCuOQALcNqe4/XUJH8=; fh=BNczk7MtTFTHa4uMdKY29AxmcfAa404kNGyDf0xbsP0=; b=M+988lEuiRpS0ymfwiNdOvE526OwTkdy31KtXE8o4vrACTXGxBmefN0+/AYmh+vyfI yEgg3mEx8ctvAoli4gI+dCuRB5CIcCTTtigu+gl2bl3/xdAVGA2jFuXHIAI6n+UIs+go ZIibdXnq8v79+ZFeqYGx62kIN7q3WAvBD+ZxO6t3vggqSmfNAs3R4oe3aC/7BugN4kn7 KDkCsmlfXuNU332qAzkyaf8K15U24fQCOp3oAPOgFZ3sO3GThSx8RENg4YL2NCn5xTK1 EAjGESbz0F74KfySP5MiF54k+0LQ4pkZeOxjase9z8iM5bgXi/wCR9GR1DG3032TkqAf ZF6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Eu7dpAuK; 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 gx19-20020a1709068a5300b009c3c26561c3si424480ejc.328.2023.11.06.17.04.02; Mon, 06 Nov 2023 17:04:09 -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=20230601 header.b=Eu7dpAuK; 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 7A94F68C50B; Tue, 7 Nov 2023 03:03:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79AF368C50B for ; Tue, 7 Nov 2023 03:03:52 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1cc330e8f58so36665035ad.3 for ; Mon, 06 Nov 2023 17:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699319030; x=1699923830; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RNxAoqVeWb+pUbroWxQFH5RYMX6x3albc14qhuLGpFs=; b=Eu7dpAuKk7cM6QoUdl/u4NFtulNKk4Sb6cULXfNwQnJzZG1w4wCEXM6QHVqC0LTCy2 5YLYTK/Cjx/0PH7pnxG/H2vo/a6ffdwUIgJMaqeC53/eSGZrsSlWSQlpzruh47v83Fdf rBFdgC6RsGua2ZaRg0mGTzpk2BsU5h9ZC7ojUUPE/yUFrT5pLbhM5tkjtoewMquVePy7 rAWs1Vm5YfIThEckdWzL0BGaOhiIKMUkzN1wj2KO/yM5LJMN50nuyPxj81lNSJbpFx1j f5YAI83dlXaidQp/Y2926LRReepn1FLPdEF4J3opGtC9EKyIXIulFln45BZb1N6is/x5 6vyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699319030; x=1699923830; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RNxAoqVeWb+pUbroWxQFH5RYMX6x3albc14qhuLGpFs=; b=GxTgwlu2u+/OEe6F+vZMyp5Se+tZBbWgsOYO3dKB51Qq0nLHxJbQjiy5kGGGLGwIXF gd1ZrlxVHQ50AM57kzMXWgghNQ7zoNeqU52d3+7iCXEB5ciXM6XRzS527ZVPdVE4X8Xh I9XRPTgHP2g/mF6Cmsu3b6Ifq4W4YmvfFKQb7azY4hNEPPJCJLsEdd0ozd9cVfVOB6cp UyBSQoiB0SgIiqsJUt16vYt0CAnN/ODujuFKhHrBV4tZez4F0RWsLZIQFT+kd60y6i5t c6eHhn99A5fMS/vQjHdq6rOBT71yTw3me5O3B4fBJ9URkCO5PW4HuuO1bhKn3B/jophJ udDg== X-Gm-Message-State: AOJu0YyWK+ey+lvmVmuETxr3FaenwPt/mKWXZIBT3O4x4QHdo1rNHUVx 4QH+JmafX/7sn44mRAuMXd6wtZJ+Fh1Etg== X-Received: by 2002:a17:903:228d:b0:1cc:5296:10fb with SMTP id b13-20020a170903228d00b001cc529610fbmr24996987plh.46.1699319029764; Mon, 06 Nov 2023 17:03:49 -0800 (PST) Received: from localhost.localdomain ([2605:a601:a98f:6200:d85b:a019:b2dc:2b7e]) by smtp.gmail.com with ESMTPSA id c2-20020a170902d90200b001b9be3b94d3sm6405188plz.140.2023.11.06.17.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 17:03:48 -0800 (PST) From: Dave Johansen To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Nov 2023 18:03:45 -0700 Message-Id: <20231107010346.16367-1-davejohansen@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: Only prevent init_time from being used when splitting by time 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: Dave Johansen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZCaw5biZzvdL --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4ef84c05c1..3548299770 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3090,7 +3090,7 @@ static int hls_init(AVFormatContext *s) if (hls->flags & HLS_APPEND_LIST) { parse_playlist(s, vs->m3u8_name, vs); vs->discontinuity = 1; - if (hls->init_time > 0) { + if ((hls->flags & HLS_SPLIT_BY_TIME) && (hls->init_time > 0)) { av_log(s, AV_LOG_WARNING, "append_list mode does not support hls_init_time," " hls_init_time value will have no effect\n"); hls->init_time = 0;