aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-08-25 10:13:48 +0200
committerPaul B Mahol <onemda@gmail.com>2017-08-25 10:16:46 +0200
commit1a58da434ad0e8ba0167c4066e3dc7980c7b2804 (patch)
treed044b1fd6afcf943c693d2d15fd0e2b402e86a08
parent01b986cf1819320aff5d5c7a43401bb74a95524a (diff)
downloadffmpeg-1a58da434ad0e8ba0167c4066e3dc7980c7b2804.tar.gz
avfilter/avf_concat: check ff_insert_pad() for failure
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavfilter/avf_concat.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 4c4936868b..6198a33d53 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -361,6 +361,7 @@ static av_cold int init(AVFilterContext *ctx)
{
ConcatContext *cat = ctx->priv;
unsigned seg, type, str;
+ int ret;
/* create input pads */
for (seg = 0; seg < cat->nb_segments; seg++) {
@@ -373,7 +374,10 @@ static av_cold int init(AVFilterContext *ctx)
.filter_frame = filter_frame,
};
pad.name = av_asprintf("in%d:%c%d", seg, "va"[type], str);
- ff_insert_inpad(ctx, ctx->nb_inputs, &pad);
+ if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) {
+ av_freep(&pad.name);
+ return ret;
+ }
}
}
}
@@ -386,7 +390,10 @@ static av_cold int init(AVFilterContext *ctx)
.request_frame = request_frame,
};
pad.name = av_asprintf("out:%c%d", "va"[type], str);
- ff_insert_outpad(ctx, ctx->nb_outputs, &pad);
+ if ((ret = ff_insert_outpad(ctx, ctx->nb_outputs, &pad)) < 0) {
+ av_freep(&pad.name);
+ return ret;
+ }
}
}