diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:58:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:58:41 +0100 |
| commit | 946cbf04ee95d800526f591ae194378fdec91150 (patch) | |
| tree | 0e24ae75607f21315387028444eb50fbef601126 | |
| parent | afb3fb335265a443aac83883606fa4274b4330b7 (diff) | |
| parent | 4750b05d67fd87263cb767b896e1cf55713a39de (diff) | |
| download | ffmpeg-946cbf04ee95d800526f591ae194378fdec91150.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_join: do not leak input frames.
asrc_anullsrc: return EOF, not -1
Conflicts:
libavfilter/asrc_anullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_join.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index d700f20156..8dffda0a31 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -486,7 +486,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; |