[FFmpeg-cvslog] lavfi/scale: return error code in case of failed reconfiguration in start_frame()

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Oct 15 09:21:15 2012 +0200| [c2428ada71af5491b0f82bf4ad9825a630c0a753] | committer: Stefano Sabatini

lavfi/scale: return error code in case of failed reconfiguration in start_frame()

Avoid an assert, since now the function supports error code return.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2428ada71af5491b0f82bf4ad9825a630c0a753
---

 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 1a4784d..5c6751b 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)