From patchwork Sun Sep 17 21:38:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5173 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2852329jaa; Sun, 17 Sep 2017 14:47:01 -0700 (PDT) X-Received: by 10.223.153.169 with SMTP id y38mr28466069wrb.46.1505684821423; Sun, 17 Sep 2017 14:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505684821; cv=none; d=google.com; s=arc-20160816; b=DoCNFzv7BrY/MJ14vlpX7JdrlArbXTMZeMYMcFcpk78+CBoSYsHj+6jw/CM5TXmd9V yYzB0Hjejojdn/g3waJt7SwEYM6e7oBI+nGT6YEEBnwH4UEx6u2CMxDQ/C/aGtctujek eixlw0hwAcxXp1x+t2toCVptiTKXIZP0vPEvxV/pKOoYicz0N882LTOTNG9W0/HHlen9 L5MT+J4Gv9hqR5ehkNtI6UWV9t4uOGYZ3LcDWIu62STtUk6XIE4mcckz3p/mgwl6mZYl BHj7FHCrvAoY9a9TbOaQ9omH+LYqvV2ny1qtPU9WaNso1Cyk0XzfdAB2Uv7iW1rNlgRx p4Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=mwhT6qq/P25R/2eOhMFAJFwleS57P1f87tGXJJm6H0Y=; b=AnaG8TvLMSbgTSZYi4RQ7fNKkpZRG+2tbbWXD0z28eYPR7MeGgMkV+hjrxld/Xq5fD 3Qk/MVp4YI/uoWxrCJD1REIC6TF2k1O/w8gOYtoY1DY24a6I+Nx57K/dc/4uuYVxxsz0 yY7ccKjPmoBNnRhZKnergF45m/cZt0w6EXGxMsx+OsZjAPVNnngoHlrVCb/x35Qx4bXA m1xHGDetqPf70luBvG9xSoxQsHvC6a3lXkAefeGjCq12cP8y+DMW2DF52z0CY9Ai4bln udviJp03wEp0hSOyqh00Svtz/J5FyvH40zEw+Nwc8vtv/BYOD+ksVQLHxDEZiBkqUFFe FHaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IFnTBkaq; 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=NONE 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 l4si4716546wre.58.2017.09.17.14.47.00; Sun, 17 Sep 2017 14:47:01 -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=@gmail.com header.s=20161025 header.b=IFnTBkaq; 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=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 45A256882A4; Mon, 18 Sep 2017 00:46:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f53.google.com (mail-it0-f53.google.com [209.85.214.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A7B7680D56 for ; Mon, 18 Sep 2017 00:46:44 +0300 (EEST) Received: by mail-it0-f53.google.com with SMTP id y126so6365957itb.5 for ; Sun, 17 Sep 2017 14:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=zHfWbHyem5BlakD2WGRZupPrvhQt4OaOZS78z2jPD4A=; b=IFnTBkaqhssjZrYPWDan8VyGQSURt3BrVfvoBA6yQpqxza9+8Mkr60+3787ecDhrvV bUjSJYv3TI6BN/3QhdyttKRnMidHANihVcrI2iRyoH66AtCPEElG/G9OdjixSPaOjXKG iZWK6srywo8N9BgoMgKqyfbt6wkewV6S1BX9wSBbyww78y38Zswuvkyb3NqqSD/jkwqR aHvZpjgX9sJp+DqUhGe0+RAmHmw2QqmOLU4D6AjbOEv7+xk/GdrxvFjqXsZOYy7yaTdH FiXEK/6vXIPxThVd6kdS8cGpLxG2A63+OvCGlOZ1eh6g9vC71JtjU92ty7QWDOgSCQ12 pu6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=zHfWbHyem5BlakD2WGRZupPrvhQt4OaOZS78z2jPD4A=; b=IpMqVe+ffhG6m8xK0le/Chzgi2nJR3AK2JUK4SOY4GUKCvRSzJ9465V7R8HxlG6Bp+ UQx+V7TUlhPYwSqgjEartJcI3Z5glA93wd/toOZyVP13g5PA+vLvKNHLo0sEpWKX8cEL 8leEDS5ZrsEQ7MsziHR0tuKEEbB+SRSfRB+43qb4DfZzTGDlCNje4AisYDL9iW3VWXn+ meEDp3h9iSEQNpwPsA3upQzm/MYEKFMsfSi5hA7AZZaKwScrHUVrghJqODr08SOqZaLN q3JxRo6oXnH2yiOw2LdZrHIOvoGhIjXOQfSI9WIF0nLk23f0qITsg8rvh22ik7KO/HTI 7j0A== X-Gm-Message-State: AHPjjUhneHgtMieRPhf77IWZ2LWw7FYfCoiULFybhCMfNS0doQInKpD5 9Hmm3bkEGqJf5z9isZNc6SPLWXJI5rgul8R6L9Y= X-Google-Smtp-Source: AOwi7QANPUBfA/nSJOvCRwxGdA+snyfgTy6KP1+Vg6EDNrpHY58OPV1ODTwGBHXFaQ3LirvxeNQF8e3wwtI5Ox5oNK4= X-Received: by 10.36.215.195 with SMTP id y186mr14783951itg.3.1505684357527; Sun, 17 Sep 2017 14:39:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.139.4 with HTTP; Sun, 17 Sep 2017 14:38:56 -0700 (PDT) From: Carl Eugen Hoyos Date: Sun, 17 Sep 2017 23:38:56 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/utils: Do not force the chapter end time before chapter start 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" Hi! Attached patch fixes ticket #6671. Please comment, Carl Eugen From 87d7914d0f60c26ac89fde3cf2a21c6c95c64b0f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 17 Sep 2017 23:34:58 +0200 Subject: [PATCH] lavf/utils: Do not force chapter end time before chapter start. Fixes ticket #6671. --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 23865c8..7abca63 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3167,7 +3167,7 @@ static void compute_chapters_end(AVFormatContext *s) if (j != i && next_start > ch->start && next_start < end) end = next_start; } - ch->end = (end == INT64_MAX) ? ch->start : end; + ch->end = (end == INT64_MAX || end < ch->start) ? ch->start : end; } } -- 1.7.10.4