From bf0712c2f8efe9731ff354870e57653badc07ef6 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 21 Feb 2013 20:15:08 +0100 Subject: libavfilter/af_amerge: fix segfault if init fails. --- libavfilter/af_amerge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 357cbbe9d5..2d68ea6126 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -63,8 +63,10 @@ static av_cold void uninit(AVFilterContext *ctx) int i; for (i = 0; i < am->nb_inputs; i++) { - ff_bufqueue_discard_all(&am->in[i].queue); - av_freep(&ctx->input_pads[i].name); + if (am->in) + ff_bufqueue_discard_all(&am->in[i].queue); + if (ctx->input_pads) + av_freep(&ctx->input_pads[i].name); } av_freep(&am->in); } -- cgit v1.2.3