]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/scale: return error code in case of failed reconfiguration in start_frame()
authorStefano Sabatini <stefasab@gmail.com>
Mon, 15 Oct 2012 07:21:15 +0000 (09:21 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Mon, 29 Oct 2012 16:39:26 +0000 (17:39 +0100)
Avoid an assert, since now the function supports error code return.

libavfilter/vf_scale.c

index 1a4784dde58b7dcbc9712ad0661f5718aaaabbd7..5c6751bcf19bd0dc1cfd62793a23c4b549ac1323 100644 (file)
@@ -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)