Browse Source

lavf/concat: deprecate file_packet_metadata

Nicolas George 3 years ago
parent
commit
76cf1ff979
4 changed files with 6 additions and 2 deletions
  1. 1 0
      doc/demuxers.texi
  2. 3 0
      libavformat/concatdec.c
  3. 1 1
      tests/extended.ffconcat
  4. 1 1
      tests/simple1.ffconcat

+ 1 - 0
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

+ 3 - 0
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;
 

+ 1 - 1
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

+ 1 - 1
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