Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
35a27402
Commit
35a27402
authored
Apr 10, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/concat: switch to an AVOptions-based system.
parent
944ad461
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
filters.texi
doc/filters.texi
+2
-1
avf_concat.c
libavfilter/avf_concat.c
+0
-3
avfilter.c
libavfilter/avfilter.c
+1
-0
No files found.
doc/filters.texi
View file @
35a27402
...
@@ -6937,7 +6937,8 @@ The filter works on segments of synchronized video and audio streams. All
...
@@ -6937,7 +6937,8 @@ The filter works on segments of synchronized video and audio streams. All
segments must have the same number of streams of each type, and that will
segments must have the same number of streams of each type, and that will
also be the number of streams at output.
also be the number of streams at output.
The filter accepts the following named parameters:
The filter accepts the following options:
@table @option
@table @option
@item n
@item n
...
...
libavfilter/avf_concat.c
View file @
35a27402
...
@@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx)
...
@@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx)
av_free
(
cat
->
in
);
av_free
(
cat
->
in
);
}
}
static
const
char
*
const
shorthand
[]
=
{
NULL
};
AVFilter
avfilter_avf_concat
=
{
AVFilter
avfilter_avf_concat
=
{
.
name
=
"concat"
,
.
name
=
"concat"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Concatenate audio and video streams."
),
.
description
=
NULL_IF_CONFIG_SMALL
(
"Concatenate audio and video streams."
),
...
@@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = {
...
@@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = {
.
inputs
=
NULL
,
.
inputs
=
NULL
,
.
outputs
=
NULL
,
.
outputs
=
NULL
,
.
priv_class
=
&
concat_class
,
.
priv_class
=
&
concat_class
,
.
shorthand
=
shorthand
,
};
};
libavfilter/avfilter.c
View file @
35a27402
...
@@ -697,6 +697,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
...
@@ -697,6 +697,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!
strcmp
(
filter
->
filter
->
name
,
"channelsplit"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"channelsplit"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"color"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"color"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"colormatrix"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"colormatrix"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"concat"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"crop"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"crop"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"cropdetect"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"cropdetect"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"curves"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"curves"
)
||
...
...
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