diff mbox series

[FFmpeg-devel,3/6] lavf/concat: deprecate file_packet_metadata

Message ID 20210831122209.586348-3-george@nsup.org
State New
Headers show
Series [FFmpeg-devel,1/6] lavf/concat: refactor parsing | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Nicolas George Aug. 31, 2021, 12:22 p.m. UTC
Signed-off-by: Nicolas George <george@nsup.org>
---
 doc/demuxers.texi       | 1 +
 libavformat/concatdec.c | 3 +++
 tests/extended.ffconcat | 2 +-
 tests/simple1.ffconcat  | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
diff mbox series

Patch

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