From c2b9bd97f5499c972b2af5398dabda191b5775e7 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 12 Mar 2013 20:17:32 +0100 Subject: [PATCH 1/2] asrc_anullsrc: return EOF, not -1 --- libavfilter/asrc_anullsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index ed7186d89b..140ad46da5 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -31,7 +31,7 @@ static int request_frame(AVFilterLink *link) { - return -1; + return AVERROR_EOF; } static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = { From 4750b05d67fd87263cb767b896e1cf55713a39de Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 20:43:35 +0100 Subject: [PATCH 2/2] af_join: do not leak input frames. --- libavfilter/af_join.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 14742de0e4..172eda387d 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -487,7 +487,8 @@ static int join_request_frame(AVFilterLink *outlink) ret = ff_filter_frame(outlink, frame); - memset(s->input_frames, 0, sizeof(*s->input_frames) * ctx->nb_inputs); + for (i = 0; i < ctx->nb_inputs; i++) + av_frame_free(&s->input_frames[i]); return ret;