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
8c6c811b
Commit
8c6c811b
authored
Mar 16, 2013
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/avf_concat: use standard options parsing.
parent
befbcc37
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
avf_concat.c
libavfilter/avf_concat.c
+3
-9
No files found.
libavfilter/avf_concat.c
View file @
8c6c811b
...
...
@@ -358,17 +358,8 @@ static int request_frame(AVFilterLink *outlink)
static
av_cold
int
init
(
AVFilterContext
*
ctx
,
const
char
*
args
)
{
ConcatContext
*
cat
=
ctx
->
priv
;
int
ret
;
unsigned
seg
,
type
,
str
;
cat
->
class
=
&
concat_class
;
av_opt_set_defaults
(
cat
);
ret
=
av_set_options_string
(
cat
,
args
,
"="
,
":"
);
if
(
ret
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Error parsing options: '%s'
\n
"
,
args
);
return
ret
;
}
/* create input pads */
for
(
seg
=
0
;
seg
<
cat
->
nb_segments
;
seg
++
)
{
for
(
type
=
0
;
type
<
TYPE_ALL
;
type
++
)
{
...
...
@@ -418,6 +409,8 @@ static av_cold void uninit(AVFilterContext *ctx)
av_free
(
cat
->
in
);
}
static
const
char
*
const
shorthand
[]
=
{
NULL
};
AVFilter
avfilter_avf_concat
=
{
.
name
=
"concat"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Concatenate audio and video streams."
),
...
...
@@ -428,4 +421,5 @@ AVFilter avfilter_avf_concat = {
.
inputs
=
NULL
,
.
outputs
=
NULL
,
.
priv_class
=
&
concat_class
,
.
shorthand
=
shorthand
,
};
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