From patchwork Sun Mar 12 18:00:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 2903 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp878158vsy; Sun, 12 Mar 2017 11:00:59 -0700 (PDT) X-Received: by 10.223.138.139 with SMTP id y11mr23011478wry.190.1489341659657; Sun, 12 Mar 2017 11:00:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n133si7744841wmf.140.2017.03.12.11.00.59; Sun, 12 Mar 2017 11:00:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2929689C57; Sun, 12 Mar 2017 20:00:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C1FB689AF0 for ; Sun, 12 Mar 2017 20:00:34 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id g10so17531426wrg.0 for ; Sun, 12 Mar 2017 11:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=zgY32mv2X17RfJhJjPVIH0x+FHSWzCN2n+4xiVZg590=; b=dz3frfkWimY3BzImnPzXt3Urf3zTCQ4DuaSbXPXmb6av4wQNaATY5l/sOli+BDNrYn s8IE/iSlw55JOG/6G42wkVJksHVG5MCCJwsr5nXfK16zdLFNyeCaR0ZCyDCiEMt4xM/D CGebj0djJC4n/JGc5I9yUmuuZZx5YfGw+pGSGF7ms3u3hMjis7SwYEXa5LLFoJiNeplu Vd9yAcRblw7TlFxyf3li+/pc5LBPV/bFqhJVhVDL0Q+bia1Y+TExFcY0SF6gyykJfqUO 7JX3qzkrYbZosXsP9zDCl0VFQwammUHF+VE24tkb2pkYrvCI4IIRCNtIpeNyklEHG8Kq 9Rfg== 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; bh=zgY32mv2X17RfJhJjPVIH0x+FHSWzCN2n+4xiVZg590=; b=M9VBTwfCnPNLQQ0jfIso++Avpl25AWD/lKVjdikHe7gu2rrlk+RpFMVaZmTklpqEld SpJ7TJsIamWZXDj4szSdWXKREnelX7Gp03vTEZRFV6V809iP5BobHZ4xyeZfTrLe0Rm6 eaXfFA1BSwFFwV8Q5HqO81+1LfEtr1t5KNfGUFtwiso48ZfEphpElP5yZJZyREAuvGSr 0RAfJXrNyKRXZxkbIy3LwZSzY+UpI7iSDO/CzVlAhmlOgMZG3Wyot9vlTB7bvZ3IrNXG J5PSsbxJVzckQsQCfobqMc3/VpHgzDVKGNo5HTggOi9U9NYJna9kZDHB8Lsaau865h/c mJJQ== X-Gm-Message-State: AMke39mtqUFIHnNUo7Y+rQgyijlR2GUUqNPDrZdefDiCo3ODbs9s1ZXPJ/TNfMey/hyatg== X-Received: by 10.223.164.216 with SMTP id h24mr23649419wrb.128.1489341648733; Sun, 12 Mar 2017 11:00:48 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id y49sm21833076wry.18.2017.03.12.11.00.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Mar 2017 11:00:47 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2017 19:00:32 +0100 Message-Id: <20170312180032.5372-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index b136cda..7a294b0 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -320,6 +320,7 @@ static int parse_cube(AVFilterContext *ctx, FILE *f) struct rgbvec *vec = &lut3d->lut[i][j][k]; do { +try_again: NEXT_LINE(0); if (!strncmp(line, "DOMAIN_", 7)) { float *vals = NULL; @@ -330,7 +331,7 @@ static int parse_cube(AVFilterContext *ctx, FILE *f) 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]); - continue; + goto try_again; } } while (skip_line(line)); if (sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3)