Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
76cf1ff9
Commit
76cf1ff9
authored
Aug 31, 2021
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/concat: deprecate file_packet_metadata
parent
7517777d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
demuxers.texi
doc/demuxers.texi
+1
-0
concatdec.c
libavformat/concatdec.c
+3
-0
extended.ffconcat
tests/extended.ffconcat
+1
-1
simple1.ffconcat
tests/simple1.ffconcat
+1
-1
No files found.
doc/demuxers.texi
View file @
76cf1ff9
...
...
@@ -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
...
...
libavformat/concatdec.c
View file @
76cf1ff9
...
...
@@ -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
;
...
...
tests/extended.ffconcat
View file @
76cf1ff9
...
...
@@ -4,7 +4,7 @@ file %SRCFILE%
file %SRCFILE%
duration 1
file_packet_meta
data dummy=
1
file_packet_meta
dummy
1
file %SRCFILE%
inpoint 00:00.00
...
...
tests/simple1.ffconcat
View file @
76cf1ff9
...
...
@@ -8,5 +8,5 @@ inpoint 00:00.80
file %SRCFILE%
inpoint 00:00.20
outpoint 00:00.40
file_packet_meta
data dummy=
1
file_packet_meta
dummy
1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment