[FFmpeg-cvslog] r26395 - trunk/libavfilter/vf_scale.c

[stefano]

Author: stefano
Date: Sun Jan 16 21:11:46 2011
New Revision: 26395

Log:
Make config_props() return AVERROR(EINVAL) rather than 1 in case of
failed SWScaleContext initialization.

Fix issue2546.

Modified:
   trunk/libavfilter/vf_scale.c

Modified: trunk/libavfilter/vf_scale.c
==============================================================================
--- trunk/libavfilter/vf_scale.c	Sun Jan 16 19:34:09 2011	(r26394)
+++ trunk/libavfilter/vf_scale.c	Sun Jan 16 21:11:46 2011	(r26395)
@@ -138,8 +138,10 @@ static int config_props(AVFilterLink *ou
     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)