diff options
| author | Nicolas George <george@nsup.org> | 2021-08-31 13:48:31 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2021-09-16 10:17:59 +0200 |
| commit | 76cf1ff9796bbee0382a21a9efe6a97ded147107 (patch) | |
| tree | 80e514d839d6c598c9985e23ac515d791cd4a2a3 | |
| parent | 7517777d06c2f0790692c3e8bb6000239665fd37 (diff) | |
lavf/concat: deprecate file_packet_metadata
| -rw-r--r-- | doc/demuxers.texi | 1 | ||||
| -rw-r--r-- | libavformat/concatdec.c | 3 | ||||
| -rw-r--r-- | tests/extended.ffconcat | 2 | ||||
| -rw-r--r-- | 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 cb6e1b58e7..0e581e9a14 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -564,6 +564,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; 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 |