mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
avfilter/avfilter: fix OOM case for default activate
Fixes OOM when caller keeps adding frames into filtergraph
that reached EOF by other means, for example EOF is signalled
by other filter in filtergraph or by buffersink.
(cherry picked from commit d9e41ead82
)
This commit is contained in:
parent
670c823406
commit
1606aab99b
@ -1167,6 +1167,16 @@ static int ff_filter_activate_default(AVFilterContext *filter)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < filter->nb_outputs; i++) {
|
||||
int ret = filter->outputs[i]->status_in;
|
||||
|
||||
if (ret) {
|
||||
for (int j = 0; j < filter->nb_inputs; j++)
|
||||
ff_inlink_set_status(filter->inputs[j], ret);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < filter->nb_inputs; i++) {
|
||||
if (samples_ready(filter->inputs[i], filter->inputs[i]->min_samples)) {
|
||||
return ff_filter_frame_to_filter(filter->inputs[i]);
|
||||
|
Loading…
Reference in New Issue
Block a user