mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-01-23 04:16:07 +00:00
avfilter/af_merge: check ff_insert_inpad() for failure
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
db5604ac26
commit
f39136b0a7
@ -322,7 +322,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
|
||||
static av_cold int init(AVFilterContext *ctx)
|
||||
{
|
||||
AMergeContext *s = ctx->priv;
|
||||
int i;
|
||||
int i, ret;
|
||||
|
||||
s->in = av_calloc(s->nb_inputs, sizeof(*s->in));
|
||||
if (!s->in)
|
||||
@ -336,7 +336,10 @@ static av_cold int init(AVFilterContext *ctx)
|
||||
};
|
||||
if (!name)
|
||||
return AVERROR(ENOMEM);
|
||||
ff_insert_inpad(ctx, i, &pad);
|
||||
if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) {
|
||||
av_freep(&pad.name);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user