From patchwork Wed Jul 28 12:15:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 29086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp5736822pxb; Wed, 28 Jul 2021 05:16:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUIdVpc0kkyA0TRgK8RYV+0PuCoWknSzkzFpmlqgxpZfYjs5woAA9bOgMH2B96Xw29c6o2 X-Received: by 2002:a17:907:961b:: with SMTP id gb27mr27089337ejc.340.1627474563805; Wed, 28 Jul 2021 05:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627474563; cv=none; d=google.com; s=arc-20160816; b=Y1/ABhSPPdaQi3490/fNZYgPtvyes8IbObdaJUdQLDsuOLIexIN4TMIN2Y7tvuUOxZ g5F0UyQqOocXQu9MmBcIBoAataz3+ibvUUea2Z7C+Nyq167X7bRVacSu+Y/uXYp9HyGp aG3JY/21GPR+palUiDi6MYS7UOkZiuPyRvDCD59H/Wytnh15p9b4XX+TZb3coO6kGwDn arRxfmKjO3Kygj9CpyfihF6m94wRg79X2eMR+/nnwbMibz6t/LNix8wMyhrduHMvRMSe sxrA50H7PouvdeIEwGwXyZL41+nc9kI8v5aaqoCE7qo0RSPIQLnjcLxVboEb41cJCAem Wb/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=F0MUZiJNHuT946jczGgIoxawb8SSomsiloV5S7fwlIk=; b=bz+feu8n+ukdZqBhDUlUzRrnr7GegybMezsYQVYMJhZQpCz980sM37nEiBHV9haX/+ xb6HECcH6K3mnZP2mMyod+rP6PZWHe4dSJsUUpeeVSqt/JZgQQpnVIlNRSB03JXcYc/g WI54oko5jAlOovsNZg4HpDgREybcugo7H1qowGFRlDFW8LWEeedlcF+RmyfGfEpU3Ad1 zWiwtX/stxeHIDWgVoUHleXUAt9TMQvcMUwMdmLHmlmfphAWWcEtNswcN9RR47EMN2yH PLmwnYljuKGq7ebxkim5f0j8qcyX7TWVqlZcyFnPMokeuesTp9j10T14MUdE0cxMXRlX eEUQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d12si6743451ejj.278.2021.07.28.05.16.03; Wed, 28 Jul 2021 05:16:03 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B56AD6808D6; Wed, 28 Jul 2021 15:15:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8370689CFE for ; Wed, 28 Jul 2021 15:15:21 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 16SCFLLW030360 for ; Wed, 28 Jul 2021 14:15:21 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 18C05E62AD; Wed, 28 Jul 2021 14:15:21 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Jul 2021 14:15:15 +0200 Message-Id: <20210728121517.533173-4-george@nsup.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210728121517.533173-1-george@nsup.org> References: <20210728121517.533173-1-george@nsup.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Wed, 28 Jul 2021 14:15:21 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 4/5] tools/dvd2concat: use option keyword. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5l2Pr1sKGEdH subfile,,start,X,end,Y,,: is ugly and will be gone. Signed-off-by: Nicolas George --- tools/dvd2concat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/dvd2concat b/tools/dvd2concat index 0280838a6b..ef04a87d05 100755 --- a/tools/dvd2concat +++ b/tools/dvd2concat @@ -117,10 +117,12 @@ for my $cell (@{$track->{cell}}) { my $file = @files == 1 ? $files[0] : "concat:" . join("|", @files); my $start = $off << 11; my $end = ($off + $size) << 11; - $file = "subfile,,start,${start},end,${end},,:$file"; my $dur = int(1000 * $cell->{length}); - $concat .= sprintf "\nfile '%s'\nduration %02d:%02d:%02d.%03d\n", $file, + $concat .= "\nfile 'subfile:$file'\n"; + $concat .= "option start $start\n"; + $concat .= "option end $end\n"; + $concat .= sprintf "duration %02d:%02d:%02d.%03d\n", int($dur / 3600000), int($dur / 60000) % 60, int($dur / 1000) % 60, $dur % 1000; }