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>

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;