From c2428ada71af5491b0f82bf4ad9825a630c0a753 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 15 Oct 2012 09:21:15 +0200 Subject: [PATCH] lavfi/scale: return error code in case of failed reconfiguration in start_frame() Avoid an assert, since now the function supports error code return. --- libavfilter/vf_scale.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 1a4784dde5..5c6751bcf1 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -316,10 +316,9 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) link->dst->inputs[0]->h = picref->video->h; if ((ret = config_props(outlink)) < 0) - av_assert0(0); //what to do here ? + return ret; } - if (!scale->sws) { outpicref = avfilter_ref_buffer(picref, ~0); if (!outpicref)