[FFmpeg-cvslog] r23121 - trunk/libavfilter/vf_pad.c

[stefano]

Author: stefano
Date: Thu May 13 20:26:07 2010
New Revision: 23121

Log:
Make the init and config_filter callbacks of the pad filter return
AVERROR(EINVAL) rather than -1 in case of invalid parameters.

Modified:
   trunk/libavfilter/vf_pad.c

Modified: trunk/libavfilter/vf_pad.c
==============================================================================
--- trunk/libavfilter/vf_pad.c	Thu May 13 20:26:03 2010	(r23120)
+++ trunk/libavfilter/vf_pad.c	Thu May 13 20:26:07 2010	(r23121)
@@ -49,12 +49,12 @@ static av_cold int init(AVFilterContext 
         sscanf(args, "%d:%d:%d:%d:%s", &pad->w, &pad->h, &pad->x, &pad->y, color_string);
 
     if (av_parse_color(pad->color, color_string, ctx) < 0)
-        return -1;
+        return AVERROR(EINVAL);
 
     /* sanity check params */
     if (pad->w < 0 || pad->h < 0) {
         av_log(ctx, AV_LOG_ERROR, "Negative size values are not acceptable.\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     return 0;
@@ -178,7 +178,7 @@ static int config_input(AVFilterLink *in
         av_log(ctx, AV_LOG_ERROR,
                "Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n",
                pad->x, pad->y, pad->x + inlink->w, pad->y + inlink->h, pad->w, pad->h);
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     return 0;