From 6fae8c5443d4fa40fe65f67138f4dbb731f23d72 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Wed, 13 Oct 2010 13:14:52 +0000
Subject: [PATCH] Make the validity checks fail only if the corresponding luma
or chroma values are not zero. Prevent aborting with the default values.
Originally committed as revision 25471 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavfilter/vf_unsharp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index e7bf95333da..5cc5aa19ba5 100644
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -133,7 +133,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
sscanf(args, "%d:%d:%lf:%d:%d:%lf", &lmsize_x, &lmsize_y, &lamount,
&cmsize_x, &cmsize_y, &camount);
- if (lmsize_x < 2 || lmsize_y < 2 || cmsize_x < 2 || cmsize_y < 2) {
+ if ((lamount && (lmsize_x < 2 || lmsize_y < 2)) ||
+ (camount && (cmsize_x < 2 || cmsize_y < 2))) {
av_log(ctx, AV_LOG_ERROR,
"Invalid value <2 for lmsize_x:%d or lmsize_y:%d or cmsize_x:%d or cmsize_y:%d\n",
lmsize_x, lmsize_y, cmsize_x, cmsize_y);
--
GitLab