Make config_props() return AVERROR(EINVAL) rather than 1 in case of
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 16 Jan 2011 20:11:46 +0000 (20:11 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 16 Jan 2011 20:11:46 +0000 (20:11 +0000)
failed SWScaleContext initialization.

Fix issue2546.

Originally committed as revision 26395 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavfilter/vf_scale.c

index 100ba2b..3f54913 100644 (file)
@@ -138,8 +138,10 @@ static int config_props(AVFilterLink *outlink)
     scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format,
                                 outlink->w, outlink->h, outlink->format,
                                 scale->flags, NULL, NULL, NULL);
+    if (!scale->sws)
+        return AVERROR(EINVAL);
 
-    return !scale->sws;
+    return 0;
 }
 
 static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)