Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavf/concat: deprecate file_packet_metadata

Browse source
This commit is contained in:
Nicolas George 2021-08-31 13:48:31 +02:00
parent 7517777d06
commit 76cf1ff979
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/demuxers.texi
View file

@ -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 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 each file packet. You can specify this directive multiple times to add multiple
metadata entries. metadata entries.
This directive is deprecated, use @code{file_packet_meta} instead.
@item @code{file_packet_meta @var{key} @var{value}} @item @code{file_packet_meta @var{key} @var{value}}
Metadata of the packets of the file. The specified metadata will be set for Metadata of the packets of the file. The specified metadata will be set for

3
libavformat/concatdec.c
View file

@ -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); av_log(avf, AV_LOG_ERROR, "Line %d: failed to parse metadata string\n", line);
FAIL(AVERROR_INVALIDDATA); 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]); av_freep(&arg_str[0]);
break; break;

2
tests/extended.ffconcat
View file

@ -4,7 +4,7 @@ file %SRCFILE%
file %SRCFILE% file %SRCFILE%
duration 1 duration 1
file_packet_metadata dummy=1 file_packet_meta dummy 1
file %SRCFILE% file %SRCFILE%
inpoint 00:00.00 inpoint 00:00.00

2
tests/simple1.ffconcat
View file

@ -8,5 +8,5 @@ inpoint 00:00.80
file %SRCFILE% file %SRCFILE%
inpoint 00:00.20 inpoint 00:00.20
outpoint 00:00.40 outpoint 00:00.40
file_packet_metadata dummy=1 file_packet_meta dummy 1