Commit 066864ac authored by Paul B Mahol's avatar Paul B Mahol

avfilter/af_rubberband: handle case when no frame is given

parent fec4212d
...@@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
av_frame_free(&in); av_frame_free(&in);
return ret; return ret < 0 ? ret : nb_samples;
} }
static int config_input(AVFilterLink *inlink) static int config_input(AVFilterLink *inlink)
...@@ -184,8 +184,11 @@ static int activate(AVFilterContext *ctx) ...@@ -184,8 +184,11 @@ static int activate(AVFilterContext *ctx)
ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in); ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret > 0) if (ret > 0) {
return filter_frame(inlink, in); ret = filter_frame(inlink, in);
if (ret > 0)
return ret;
}
FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_STATUS(inlink, outlink);
FF_FILTER_FORWARD_WANTED(outlink, inlink); FF_FILTER_FORWARD_WANTED(outlink, inlink);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment