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
c74b0eda
Commit
c74b0eda
authored
Apr 11, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/amerge: switch to an AVOptions-based system.
parent
eabc0c73
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
10 deletions
+2
-10
filters.texi
doc/filters.texi
+1
-1
af_amerge.c
libavfilter/af_amerge.c
+1
-8
avfilter.c
libavfilter/avfilter.c
+0
-1
No files found.
doc/filters.texi
View file @
c74b0eda
...
...
@@ -759,7 +759,7 @@ aformat=sample_fmts=u8|s16:channel_layouts=stereo
Merge two or more audio streams into a single multi-channel stream.
The filter accepts the following
named
options:
The filter accepts the following options:
@table @option
...
...
libavfilter/af_amerge.c
View file @
c74b0eda
...
...
@@ -306,15 +306,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static
av_cold
int
init
(
AVFilterContext
*
ctx
,
const
char
*
args
)
{
AMergeContext
*
am
=
ctx
->
priv
;
int
ret
,
i
;
int
i
;
am
->
class
=
&
amerge_class
;
av_opt_set_defaults
(
am
);
ret
=
av_set_options_string
(
am
,
args
,
"="
,
":"
);
if
(
ret
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Error parsing options: '%s'
\n
"
,
args
);
return
ret
;
}
am
->
in
=
av_calloc
(
am
->
nb_inputs
,
sizeof
(
*
am
->
in
));
if
(
!
am
->
in
)
return
AVERROR
(
ENOMEM
);
...
...
libavfilter/avfilter.c
View file @
c74b0eda
...
...
@@ -674,7 +674,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
static
const
char
*
const
filters_left_to_update
[]
=
{
"abuffer"
,
"aconvert"
,
"amerge"
,
"aresample"
,
"atempo"
,
"buffer"
,
...
...
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