From patchwork Sun Nov 11 16:41:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 10986 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 843E644D389 for ; Sun, 11 Nov 2018 18:42:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0273F689FA0; Sun, 11 Nov 2018 18:41:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6194689E8B for ; Sun, 11 Nov 2018 18:41:26 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id i73-v6so896457wmd.5 for ; Sun, 11 Nov 2018 08:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=oeG2TI3M71O42pxhqMxJziudOChdMvuWWiuKy41aleM=; b=qbXwuhWhuHAvgfV57MwC7BIz36Cit4jce5BYIkmjNM0dgdDnJ0BDXVnR85yUdxIylV 3X9VWtHS0B4mc/iAjMdTcfEfUYEFWvKNvgt6+eG59rN+0cS8kyxP8LL2hRHoo5TRQlSg iHAeMcA2MFW4jNGoay00uRdZ2bKFN34j9M87FLw6k3VE/eyw5VmZOBY2ecyOB5j0Q1YJ 47EsxTkGh0mHEGkIAZ29V8Aj8JPP3+6JfV+fJVVnDs2Har4aQSgokBi/iwaKGpmIvlfo IFcUm63NkWpCKFRBidY1AAwabf/2ZMjvatzXREYzQLAp71k8sY17Hatze0D4U+zW1WxK PH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oeG2TI3M71O42pxhqMxJziudOChdMvuWWiuKy41aleM=; b=AiTB9IJITNkPVAt7uDWHZjllqeuNh28PWkI2RkceTOfHnGFBATB5no3i+NFMz7sELl QpN9o0tZs4G7iy3Ufl8teBKm4ELpJXWT1R720e5JTaUsNKim76mjnWgSgMoyOGstGbAi 5V2352WMOrCkgU9dea4kpLvkiwkgT45l7dUsnn+xUgXiJ7nHaTXYU3oul7sNdxXtsCar sP99Q3AOni/ftKjtFAR/I+hzDd9SwnsSjq04xYk8bPFjgiOSxe2qGS2WQjjH/0LtY26G HhvMZKM5N+NTzFXr+MlVLonh0o9LMI0bvtPX3VyL+UyB6gGrWaDw72VUZvYDUW1FNOiT D32A== X-Gm-Message-State: AGRZ1gIkPdV1JGKhiT20qr89lHq5EETpZvLUrSwoBO/TLKrjAyN70XB3 F/1J5Yv9xSCA5Afw8Le0AkrK0Rri7oE= X-Google-Smtp-Source: AJdET5dyf5AubTtStztTwsKFw8pZ/b+RCw/D4zdHq2f1UsnRqwlspr/YRZNIIqn+lHSRxFyFL74HQw== X-Received: by 2002:a1c:e910:: with SMTP id q16-v6mr5292544wmc.148.1541954522959; Sun, 11 Nov 2018 08:42:02 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l5-v6sm13020431wrv.84.2018.11.11.08.42.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 08:42:02 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Nov 2018 17:41:50 +0100 Message-Id: <20181111164150.27263-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181111164150.27263-1-onemda@gmail.com> References: <20181111164150.27263-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_lut3d: use av_sscanf X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_lut3d.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index e7601a05ac..93053ed263 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -367,7 +367,7 @@ static int parse_dat(AVFilterContext *ctx, FILE *f) struct rgbvec *vec = &lut3d->lut[k][j][i]; if (k != 0 || j != 0 || i != 0) NEXT_LINE(skip_line(line)); - if (sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) + if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) return AVERROR_INVALIDDATA; } } @@ -407,7 +407,7 @@ try_again: else if (!strncmp(line + 7, "MAX ", 4)) vals = max; if (!vals) return AVERROR_INVALIDDATA; - sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); + av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f | max: %f %f %f\n", min[0], min[1], min[2], max[0], max[1], max[2]); goto try_again; @@ -415,7 +415,7 @@ try_again: goto try_again; } } while (skip_line(line)); - if (sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) + if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) return AVERROR_INVALIDDATA; vec->r *= max[0] - min[0]; vec->g *= max[1] - min[1]; @@ -448,7 +448,7 @@ static int parse_3dl(AVFilterContext *ctx, FILE *f) struct rgbvec *vec = &lut3d->lut[k][j][i]; NEXT_LINE(skip_line(line)); - if (sscanf(line, "%d %d %d", &r, &g, &b) != 3) + if (av_sscanf(line, "%d %d %d", &r, &g, &b) != 3) return AVERROR_INVALIDDATA; vec->r = r / scale; vec->g = g / scale; @@ -512,7 +512,7 @@ static int parse_m3d(AVFilterContext *ctx, FILE *f) float val[3]; NEXT_LINE(0); - if (sscanf(line, "%f %f %f", val, val + 1, val + 2) != 3) + if (av_sscanf(line, "%f %f %f", val, val + 1, val + 2) != 3) return AVERROR_INVALIDDATA; vec->r = val[rgb_map[0]] * scale; vec->g = val[rgb_map[1]] * scale; @@ -1046,12 +1046,12 @@ try_again: else if (!strncmp(line + 7, "MAX ", 4)) vals = max; if (!vals) return AVERROR_INVALIDDATA; - sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); + av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f | max: %f %f %f\n", min[0], min[1], min[2], max[0], max[1], max[2]); goto try_again; } else if (!strncmp(line, "LUT_1D_INPUT_RANGE ", 19)) { - sscanf(line + 19, "%f %f", min, max); + av_sscanf(line + 19, "%f %f", min, max); min[1] = min[2] = min[0]; max[1] = max[2] = max[0]; goto try_again; @@ -1059,7 +1059,7 @@ try_again: goto try_again; } } while (skip_line(line)); - if (sscanf(line, "%f %f %f", &lut1d->lut[0][i], &lut1d->lut[1][i], &lut1d->lut[2][i]) != 3) + if (av_sscanf(line, "%f %f %f", &lut1d->lut[0][i], &lut1d->lut[1][i], &lut1d->lut[2][i]) != 3) return AVERROR_INVALIDDATA; lut1d->lut[0][i] *= max[0] - min[0]; lut1d->lut[1][i] *= max[1] - min[1];