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
89389b7e
Commit
89389b7e
authored
Oct 30, 2019
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_afade: check for eof after crossfade later
Fixes memleaks and #8346
parent
648b422e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
af_afade.c
libavfilter/af_afade.c
+6
-6
No files found.
libavfilter/af_afade.c
View file @
89389b7e
...
...
@@ -454,7 +454,12 @@ static int activate(AVFilterContext *ctx)
if
(
s
->
crossfade_is_over
)
{
ret
=
ff_inlink_consume_frame
(
ctx
->
inputs
[
1
],
&
in
);
if
(
ret
<
0
)
{
if
(
ret
>
0
)
{
in
->
pts
=
s
->
pts
;
s
->
pts
+=
av_rescale_q
(
in
->
nb_samples
,
(
AVRational
){
1
,
outlink
->
sample_rate
},
outlink
->
time_base
);
return
ff_filter_frame
(
outlink
,
in
);
}
else
if
(
ret
<
0
)
{
return
ret
;
}
else
if
(
ff_inlink_acknowledge_status
(
ctx
->
inputs
[
1
],
&
status
,
&
pts
))
{
ff_outlink_set_status
(
ctx
->
outputs
[
0
],
status
,
pts
);
...
...
@@ -464,11 +469,6 @@ static int activate(AVFilterContext *ctx)
ff_inlink_request_frame
(
ctx
->
inputs
[
1
]);
return
0
;
}
}
else
{
in
->
pts
=
s
->
pts
;
s
->
pts
+=
av_rescale_q
(
in
->
nb_samples
,
(
AVRational
){
1
,
outlink
->
sample_rate
},
outlink
->
time_base
);
return
ff_filter_frame
(
outlink
,
in
);
}
}
...
...
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