summaryrefslogtreecommitdiff
path: root/libavfilter/vf_pad.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-11-13 13:55:01 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-11-13 13:55:01 +0000
commit2722dd6ebf9d93ab097c303df1d789f6074121c8 (patch)
treee43c90a7cae8457f355aa91128cbff5772819998 /libavfilter/vf_pad.c
parent521b8607488966a236cee5268a8797f3ed37e1ed (diff)
improve av_parse_color() to allow for non-null terminated color string
Originally committed as revision 25744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/vf_pad.c')
-rw-r--r--libavfilter/vf_pad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 2b798cc5b4..26fe1d683f 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -143,7 +143,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
if (args)
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)
+ if (av_parse_color(pad->color, color_string, -1, ctx) < 0)
return AVERROR(EINVAL);
/* sanity check params */
@@ -377,7 +377,7 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaq
color->time_base.num = frame_rate_q.den;
color->time_base.den = frame_rate_q.num;
- if ((ret = av_parse_color(color->color, color_string, ctx)) < 0)
+ if ((ret = av_parse_color(color->color, color_string, -1, ctx)) < 0)
return ret;
return 0;