From patchwork Wed Oct 24 09:37:46 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: 10765 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 6AD4944B143 for ; Wed, 24 Oct 2018 12:44:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D332368A564; Wed, 24 Oct 2018 12:43:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BD4568A47D for ; Wed, 24 Oct 2018 12:43:37 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id c15-v6so4409066eds.4 for ; Wed, 24 Oct 2018 02:44:06 -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=cughmBf0Kzk7HP/61rUz/uOdcNiqQPV3UDVgxfG0ZN0=; b=qx5qbqiaG/KRKjwEs5gsRqL3pmhzckGPlDLBV849i4xBO7MuRqoLfREO1SlpwMPTVY lqQkbkhBSI0F8T6PCsEkUAoayzly4MtZJbtYUf/yl6HrPaKyMsfQ0eXW/6RKp5NkjoIu dQoDZP0MbUbz0q3G6yJChSOV0BHhuRFSOfFBEmGQpTjmU+xNGet3e3veq2jh2ar5xHqy tbXO4gJG901T65pvU/6kaz8vJnXBLXJCSBbWLduwRBiJLO6I6tYYZL9QYgGlUVcsSy/m 3FBPpGv2JaV19/35QzO2FkcKM6nfsnoZDFWzREBrLeL169ZhhwNzqP15Sv11x61g43Pr gVjg== 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=cughmBf0Kzk7HP/61rUz/uOdcNiqQPV3UDVgxfG0ZN0=; b=X4dkzKfpe6AlUroK0YlVQYQQ5tuySzv9BM8Hzhj/PyO/KKlLPh9Vj9eCCI5pjDzSng XlCnQecrGeHSu77LERTtJePf1y0u2XDh9FYdhjQPMccHKPVEZi1EHCMQGvxZRlqwm6PJ 2qVbmO67XNYmVjdAkue0XlduCWFwm0//ahaLlWPfGMkduZyElxYDHfBSPxqurlLQcAd9 hxl9jAda7ERHINqGImMhmsDmvNf4uXPmGgicGSQqSK/ObmY9SbdbV+AGikrGPHkvfjic dCMa77qPaHYtK6Oq+PeGX5dbtetsu0xS70X5zo40Nlj1vhBgXvKkRNpHnutAaUMHkeBv 29/Q== X-Gm-Message-State: AGRZ1gJseolfDrHthck5/k8jK8+2vQ9Mn/cPZssyfKpxKXF/cMa+rqtY VXYpSOuqnc2BQ9fst+c6N7LpfktFOVY= X-Google-Smtp-Source: AJdET5fAorMiUIvwIXSbfXslix/J3SfiY9e4L1566wWzFN+qb67LnaOHDbq2e384F0gsVW35nzjN3w== X-Received: by 2002:a50:a3f6:: with SMTP id t51-v6mr3479744edb.238.1540373934546; Wed, 24 Oct 2018 02:38:54 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id m25-v6sm1506044edc.86.2018.10.24.02.38.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 02:38:54 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Oct 2018 11:37:46 +0200 Message-Id: <20181024093746.2294-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_lut3d: do not error out if TITLE is after other lines 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 4d985c599f..f328b30a8f 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -411,6 +411,8 @@ try_again: 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, "TITLE", 5)) { + goto try_again; } } while (skip_line(line)); if (sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) @@ -1051,6 +1053,8 @@ try_again: min[1] = min[2] = min[0]; max[1] = max[2] = max[0]; goto try_again; + } else if (!strncmp(line, "TITLE", 5)) { + 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)