virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avfilter/avfilter: fix OOM case for default activate

Browse Source 
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 d9e41ead82263e96ebd14d4d88d6e7f858dd944c)
This commit is contained in:
Paul B Mahol 2023-12-01 16:59:07 +01:00 committed by James Almer
parent 670c823406
commit 1606aab99b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/avfilter.c
View File

@ -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]);