[FFmpeg-devel] [PATCH] Make the validity checks fail only if the corresponding luma or chroma values are not zero. Prevent aborting with the default values.
Stefano Sabatini
stefano.sabatini-lala
Wed Oct 13 01:49:06 CEST 2010
---
libavfilter/vf_unsharp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index e7bf953..5cc5aa1 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);
--
1.7.1
More information about the ffmpeg-devel
mailing list