From patchwork Tue Aug 31 12:22:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 29905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4873657iov; Tue, 31 Aug 2021 05:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmZurXbDRYEFBMVZeSgUvzfQYw95x+YpLwVUdOpCz1T290OgZNDS4z9vYY4FQH84DInUOL X-Received: by 2002:a17:907:2a51:: with SMTP id fe17mr30824077ejc.179.1630412574057; Tue, 31 Aug 2021 05:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630412574; cv=none; d=google.com; s=arc-20160816; b=o2jCbmDaF1TzHkO8tE34ciCYweXvVjrtULg4bUw4jDe0ujVxAxlZdZuFlouPaYfZNF yk5zJ+j9gBa62t1NbJQTMYrrc402JCT9200Tw9kA25yyg0/oK/+WpLjrDOiNNp7HDTDC W3Ha5vafg3U3fSXrX5rX75C2ICXWXj0uNHJF3lBa79ajeQuibX0dCJ66H7/nFPQe7KWK r4AzQj61CmZEN4KdJA91OqEWdFp57AZW0Iq6G3tVCxyk404P3vlFbHPH5MwozN/gUyFN wa3taiSrTR1rHjZHE0rRuOtnXBxzsqXhwzVPuytw1j6VyG9HRD3ZtHWZvjXgZ0DSxbSU LxZQ== 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=WMZ7ht9uDMCumfv1nS4uV69E9+KShr2Gzy9yRKZU+DU=; b=jz/DA5YmlZdXIUfGRDoFu1xikjW2RcTxtVZSSbXaro3nYB1jgr4V7XjjfhgNiWioxM H/IKbRVh5j6uDNLp1BD+nrpFHGfHMSa1SrmZtylDeJiTnTZqCdzwUlWDdPJcySkGUzJ/ 2vgWJ8W+mCjoVW/Jn8scBj6N8Bkc9NAR8FrSyOZ7P7MMbj45KsAae1geOpuQTv6vV+to l8sStroD/NftqrK4n3E1F/imMA2d8+IhKZsk0Jd0WbRdQONgXK2V63OLuTYx7reYQBeD 2CKO9H4dVJEwLnd9O7/BMe9gX9MceQ+4PR0T2QkyL4egMLmgNbroeVhYUv8hhywM0p8o w4Og== 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 nd15si16342851ejc.463.2021.08.31.05.22.46; Tue, 31 Aug 2021 05:22:54 -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 95ED568A0EA; Tue, 31 Aug 2021 15:22:21 +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 49DB2680923 for ; Tue, 31 Aug 2021 15:22:13 +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 17VCMC2T019254 for ; Tue, 31 Aug 2021 14:22:12 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 8334BEB5BC; Tue, 31 Aug 2021 14:22:12 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 14:22:06 +0200 Message-Id: <20210831122209.586348-3-george@nsup.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210831122209.586348-1-george@nsup.org> References: <20210831122209.586348-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]); Tue, 31 Aug 2021 14:22:12 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 3/6] lavf/concat: deprecate file_packet_metadata 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: rrpwM7w3OzgZ Signed-off-by: Nicolas George --- doc/demuxers.texi | 1 + libavformat/concatdec.c | 3 +++ tests/extended.ffconcat | 2 +- tests/simple1.ffconcat | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index f338700396..fd06be3195 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -150,6 +150,7 @@ directive) will be reduced based on their specified Out point. Metadata of the packets of the file. The specified metadata will be set for each file packet. You can specify this directive multiple times to add multiple metadata entries. +This directive is deprecated, use @code{file_packet_meta} instead. @item @code{file_packet_meta @var{key} @var{value}} Metadata of the packets of the file. The specified metadata will be set for diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 76f3fafa50..2981c7c27f 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -557,6 +557,9 @@ static int concat_parse_script(AVFormatContext *avf) av_log(avf, AV_LOG_ERROR, "Line %d: failed to parse metadata string\n", line); FAIL(AVERROR_INVALIDDATA); } + av_log(avf, AV_LOG_WARNING, + "'file_packet_metadata key=value:key=value' is deprecated, " + "use multiple 'file_packet_meta key value' instead\n"); av_freep(&arg_str[0]); break; case DIR_OPTION: diff --git a/tests/extended.ffconcat b/tests/extended.ffconcat index 7359113c23..c8afbcedb5 100644 --- a/tests/extended.ffconcat +++ b/tests/extended.ffconcat @@ -4,7 +4,7 @@ file %SRCFILE% file %SRCFILE% duration 1 -file_packet_metadata dummy=1 +file_packet_meta dummy 1 file %SRCFILE% inpoint 00:00.00 diff --git a/tests/simple1.ffconcat b/tests/simple1.ffconcat index 0a754af421..c9299e0faa 100644 --- a/tests/simple1.ffconcat +++ b/tests/simple1.ffconcat @@ -8,5 +8,5 @@ inpoint 00:00.80 file %SRCFILE% inpoint 00:00.20 outpoint 00:00.40 -file_packet_metadata dummy=1 +file_packet_meta dummy 1