From patchwork Fri Nov 11 13:58:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 1387 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1409453vsb; Fri, 11 Nov 2016 05:58:45 -0800 (PST) X-Received: by 10.28.232.73 with SMTP id f70mr33325559wmh.127.1478872725895; Fri, 11 Nov 2016 05:58:45 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l10si10377275wjr.92.2016.11.11.05.58.45; Fri, 11 Nov 2016 05:58:45 -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; 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 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 70D96689E40; Fri, 11 Nov 2016 15:58:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE38568028F for ; Fri, 11 Nov 2016 15:58:36 +0200 (EET) Received: by mail-qt0-f176.google.com with SMTP id p16so9887151qta.0 for ; Fri, 11 Nov 2016 05:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=IMrHtv67st5/pIXtGHh6vk0Hhi8Z4xsr26CE+5bEoP4=; b=yExY1KH/lOe/nfGrgoqPgV01CfH+2bdCbdysFnNxE1QVwlaPyq5D4EvR2h32OzoQbs CZscSvL0Rnpbl+Uhf1DVQ6I78Dw0DNHfWHEdl7qjMDLyWUr79YgR3S7dUUh8YhBSmfqi 7hUr8O4jy2kRkFi8pQtKH9UcweTWF0CcQfWgLMR2R3MpV9m4zasXo+vMxL7+EUlzPDUC vdqzF+P0Il+YqD35mb5ak4aDI5XWJA7Kt31Db2EX/oepSZZM0M8pKLCrICIweh1jjKnU 75MAHjEfm/OK2jFmaJLMf8EUkzm1IQsXK1F1ZO/yjpOQuXfmP4qf+cl/NtRJQknollfR wGGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=IMrHtv67st5/pIXtGHh6vk0Hhi8Z4xsr26CE+5bEoP4=; b=IiYLCUW7a29BU986DxjgMhyY35gT7s96pXrp3YpSRowlAJk/5xLNvVnG8bFKSICoeZ /nvVaUkkmYR0utRyScEJD673VWejThZAMCkAPiqoSJT/pLqjOHdsMDDxX8g4WUlYB146 a7mG66OxkIkK739O1LbJUu7ytkEX9n4MWLAORT/+NzL3b3UUVepLOm2+kwTQJbRunry/ ssW8aLSkyXkRX6aYwvStTcX0YBL0eSb3FQyzBbQ5Usdw7nxUx45AywLV4kjMsVsArtpK oIktWkVmwrJe6W08pkl8y90WiM43vr8x67ynnHEME6DA2PPCw+CUQjusj/pI9naru+Aw loYA== X-Gm-Message-State: ABUngvdbbKmqTUaQi8sRYsW/TrCSX0bxGeKS6wMkAQRy9pEwuRRYFN83yvioMBLLS/IAcM4a0vzf9NutOsfrTw== X-Received: by 10.237.62.89 with SMTP id m25mr3417701qtf.119.1478872714830; Fri, 11 Nov 2016 05:58:34 -0800 (PST) MIME-Version: 1.0 Received: by 10.237.63.66 with HTTP; Fri, 11 Nov 2016 05:58:34 -0800 (PST) In-Reply-To: <20161111134049.GB4824@nb4> References: <20161111134049.GB4824@nb4> From: Steven Liu Date: Fri, 11 Nov 2016 21:58:34 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] increment initial_prog_date_time when removing old segments 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" 2016-11-11 21:40 GMT+08:00 Michael Niedermayer : > On Fri, Nov 11, 2016 at 10:13:43AM +0100, Robert Nagy wrote: > > Fixes https://trac.ffmpeg.org/ticket/5940#ticket > > > > --- > > libavformat/hlsenc.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > > index 9ca2df7..80a598a 100644 > > --- a/libavformat/hlsenc.c > > +++ b/libavformat/hlsenc.c > > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext *hls) > { > > segment = hls->old_segments; > > while (segment) { > > playlist_duration -= segment->duration; > > + initial_prog_date_time += segment->duration; > > src/libavformat/hlsenc.c: In function ‘hls_delete_old_segments’: > src/libavformat/hlsenc.c:186:9: error: ‘initial_prog_date_time’ > undeclared (first use in this function) > src/libavformat/hlsenc.c:186:9: note: each undeclared identifier is > reported only once for each function it appears in > > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Those who would give up essential Liberty, to purchase a little > temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Fri, 11 Nov 2016 21:56:00 +0800 Subject: [PATCH] increment initial_prog_date_time when removing old segments Fixes https://trac.ffmpeg.org/ticket/5940#ticket Reviewed-by: Michael Niedermayer <> Signed-off-by: Robert Nagy Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 1 + 1 file changed, 1 insertion(+) -- 2.9.3 (Apple Git-75) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 9ca2df7..e16fb0c 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext *hls) { segment = hls->old_segments; while (segment) { playlist_duration -= segment->duration; + hls->initial_prog_date_time += segment->duration; previous_segment = segment; segment = previous_segment->next; if (playlist_duration <= -previous_segment->duration) {