From patchwork Mon Nov 12 06:54:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Harris X-Patchwork-Id: 10992 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 CA4C444DC19 for ; Mon, 12 Nov 2018 09:03:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41105689BB6; Mon, 12 Nov 2018 09:02:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78C03689BB6 for ; Mon, 12 Nov 2018 09:02:28 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id g62so588105pfd.12 for ; Sun, 11 Nov 2018 23:03:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=grPzdmx83mvpsEhSFblIOfW57nSMuNoB7x6u+rUdf0A=; b=cHpRQbFuQ8D/yjlgSqJrgTjfy+wOQZR60AMqQ+TYhk0yLm9ds04oI90XXfl+BJ/lDr jHkFy1wADQfeStCExSAyQMFECOvoPpNQyyBzDjoM/MNEzr/XxSuZNmAg8Bbt6I+nBQ8j 0+g2nFouWFC6aKeoNDnH9cGVeooZoXVkRI+Q4koLS14wJwplhieDpkoaTUqxIuTh4KsT GKqPO6mdViNhUmzxNS79OyFGvUv2gflVr1TaYxDluNzSE1WrOSVvpJDHJULIjVzp2w+0 FzxWB37MI8K+ygAh7HwS+tvxSRftjjN2KWrMOqC5dT87IqqpmfayzSIOKWn8i7N9zRQ1 g1tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=grPzdmx83mvpsEhSFblIOfW57nSMuNoB7x6u+rUdf0A=; b=AljbfcsKn5ZmIO4P8uMCUquI0BQkVg3uyJBGgnI9hi5OuyL0PgihurKYEy4hLCb6Tp CLSQZRZLdu8N1y+wP5EEVn6M8aJOJQ/x5ZRgOQ/djOcrEDe+vlEv5lKUAzYywBIyM4jk tJT/nEQzYaJotQgFlJxlQb3IL/BGJXYrurrFm4n253e62DHTLoEyYeuPnXZ3PHv3SSb0 ipSiefX3KyEObMFCHGhokYNh+q4OOg3O+9UG72LgrEQZgR87U+wQQ6w1n/ITSTliSf7d OtnvOJxshASWK/w7l6ctxnvTqS+0U7bEsZSazVVOv34q9HzPU+WYLG+2r2snsmbZrsQP tsSA== X-Gm-Message-State: AGRZ1gJqAZFrQJLOssiyNSnpIOvnD6jWpVVunLhdO8ooey6gnGE4e/un GO5aD2DywPJmI27SGXf37Yr1fSHg X-Google-Smtp-Source: AJdET5cTLcVKERRRjadZth5PREKJMyn4Lja5boNplG1ml0FFnPBykRgGrdPuJdZvgOOdF5b45+7Egw== X-Received: by 2002:a62:7a92:: with SMTP id v140-v6mr18902964pfc.46.1542005712694; Sun, 11 Nov 2018 22:55:12 -0800 (PST) Received: from kira.gmail.com ([2601:646:9500:53f1:15e5:f6c2:f075:b00d]) by smtp.gmail.com with ESMTPSA id d21sm4282814pgv.37.2018.11.11.22.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 22:55:12 -0800 (PST) From: Mark Harris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Nov 2018 22:54:04 -0800 Message-Id: <20181112065404.8831-1-mark.hsj@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_fade: fix start/duration max value 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 Cc: Mark Harris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A fade out (usually at the end of a video) can easily start beyond INT32_MAX (about 36 minutes). Regression since d40dc64173. --- libavfilter/vf_fade.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index c30c41db0d..17eca109b6 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -386,13 +386,13 @@ static const AVOption fade_options[] = { OFFSET(nb_frames), AV_OPT_TYPE_INT, { .i64 = 25 }, 0, INT_MAX, FLAGS }, { "alpha", "fade alpha if it is available on the input", OFFSET(alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FLAGS }, { "start_time", "Number of seconds of the beginning of the effect.", - OFFSET(start_time), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS }, + OFFSET(start_time), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT64_MAX, FLAGS }, { "st", "Number of seconds of the beginning of the effect.", - OFFSET(start_time), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS }, + OFFSET(start_time), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT64_MAX, FLAGS }, { "duration", "Duration of the effect in seconds.", - OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS }, + OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT64_MAX, FLAGS }, { "d", "Duration of the effect in seconds.", - OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT32_MAX, FLAGS }, + OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64 = 0. }, 0, INT64_MAX, FLAGS }, { "color", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "c", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS }, { NULL }