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
8b9c400f
Commit
8b9c400f
authored
Nov 28, 2023
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_amerge: use already provided outlink
parent
c979ccdf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
af_amerge.c
libavfilter/af_amerge.c
+4
-4
No files found.
libavfilter/af_amerge.c
View file @
8b9c400f
...
...
@@ -156,7 +156,7 @@ static int config_output(AVFilterLink *outlink)
char
buf
[
128
];
int
i
;
s
->
bps
=
av_get_bytes_per_sample
(
ctx
->
outputs
[
0
]
->
format
);
s
->
bps
=
av_get_bytes_per_sample
(
outlink
->
format
);
outlink
->
time_base
=
ctx
->
inputs
[
0
]
->
time_base
;
av_bprint_init
(
&
bp
,
0
,
AV_BPRINT_SIZE_AUTOMATIC
);
...
...
@@ -166,7 +166,7 @@ static int config_output(AVFilterLink *outlink)
av_bprintf
(
&
bp
,
"%s"
,
buf
);
}
av_bprintf
(
&
bp
,
" -> out:"
);
av_channel_layout_describe
(
&
ctx
->
outputs
[
0
]
->
ch_layout
,
buf
,
sizeof
(
buf
));
av_channel_layout_describe
(
&
outlink
->
ch_layout
,
buf
,
sizeof
(
buf
));
av_bprintf
(
&
bp
,
"%s"
,
buf
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"%s
\n
"
,
bp
.
str
);
...
...
@@ -234,7 +234,7 @@ static int try_push_frame(AVFilterContext *ctx, int nb_samples)
ins
[
i
]
=
inbuf
[
i
]
->
data
[
0
];
}
outbuf
=
ff_get_audio_buffer
(
ctx
->
outputs
[
0
]
,
nb_samples
);
outbuf
=
ff_get_audio_buffer
(
outlink
,
nb_samples
);
if
(
!
outbuf
)
{
free_frames
(
s
->
nb_inputs
,
inbuf
);
return
AVERROR
(
ENOMEM
);
...
...
@@ -279,7 +279,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
free_frames
(
s
->
nb_inputs
,
inbuf
);
return
ff_filter_frame
(
ctx
->
outputs
[
0
]
,
outbuf
);
return
ff_filter_frame
(
outlink
,
outbuf
);
}
static
int
activate
(
AVFilterContext
*
ctx
)
...
...
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