From patchwork Mon May 24 03:35:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 27931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2577031iof; Sun, 23 May 2021 20:35:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVtpSf4WcFboeHa2U/xdnMXVmlpgzZhRs1Nv8D60dy+/mj2tzL9eIDzIJ/ZJ+2aq7vfIJ3 X-Received: by 2002:a17:906:7052:: with SMTP id r18mr1025784ejj.449.1621827327216; Sun, 23 May 2021 20:35:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621827327; cv=none; d=google.com; s=arc-20160816; b=YTyrJsU1xzPo84fRWs+n1EFNM/I5Uy9/Cd9oDPvYDb+Mk3bMInqZbARZmiE3JLDRE5 8BPL0Y05rVidt1+9BA7cm8zjrWMOOGfzxr4w3ilYGP4+tXYBwkM4frnUw+/1tObPg2UX IUhOKq/euFUlCznKghOAe3Ru8se6usOFtzWiIMK34KQVPPFaDt1qRrki31HnL+BTtW1J 2aapx9nl4GWjAzOyw0y6gmh2VG1Dat9xU15Ryk9w0UNZfY06QSkg+XqzwuT3qJ9iJhT0 rFJCWcYuTQermxEbtTX9PRy9A9D9qgJnV9ARJJl14gnDMgpI7AX7q/GnIi7gtTVFuPUT txRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=KlbBdMMQO+bau06jzAN5KeLJ2ms1/obiu9wwQ4kil+U=; b=D7WNcO2hFtdgbbJ75H6yaDwKJwHaKaGbOwdxDgl8qe3BRWts1IwoilEYT4gF97nQlx mAiycrWgDgTbtvlykqXMEdC1IQKLIQXx6LzQAI2BgtnaE4kE7n7Z5Sc//Pkdzdpt9u6n F23Fybae9J/FpsyAMy+Cqx/xauca0pr9FxIdmUekWdnDwVuZnC0GzYP5SiTL6lsCXCvc UVUPTBJ9pOJxXB9gw7pIv/8GdGIJphPYxmkf1yCrcHdRl8so6rc2A3otnn2HvHTJ9kWU ZDEKQS9DJ+azUsz9We9uiVIi0fxyIvSvLIpI+qXQrjbrgGblnDVBbsoWRDVeC6RTrIjs Yp7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Qnl7WSPe; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y59si11179060ede.390.2021.05.23.20.35.26; Sun, 23 May 2021 20:35:27 -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 header.s=20161025 header.b=Qnl7WSPe; 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=QUARANTINE 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 678E36880FE; Mon, 24 May 2021 06:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53F4768018F for ; Mon, 24 May 2021 06:35:16 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id f12so31697015ljp.2 for ; Sun, 23 May 2021 20:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NVrVBqWa6UYVX4JDZLXjGbA2b3K4y5LtfKyqKwnwHzw=; b=Qnl7WSPeHiEIDSxtGoCorS1DPxEqDV6coA2t6pLigrSnGtAVXpdatacgeXSYfke/9v rd2qMPoBwQ+6DbKuM0GpwAR+Q2lzHcYBkD3fPq+D6Xx0qiiwxGBuuPMC8WZjIAh+AMhq Opq2/XQPB2e3/S6z2PNIJs6Zn+K2ugNEMU/B0GjEfJm5Zak6j9d8Lv/0I5+h5QTWM5cj fQ3+X7CbnZ/dxqqlShdseFV1hSlb3UwY+8kM4t22nP1ltvGYx6Yo6ygsl73tX/lFDOU9 cMmHDYzmub+zALl/Z7atWAL3p1YpVj1EpUM+dmhZiUz0MlcpPsLtjrdCvJSnkQcw8xAR ++3w== 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:mime-version :content-transfer-encoding; bh=NVrVBqWa6UYVX4JDZLXjGbA2b3K4y5LtfKyqKwnwHzw=; b=IPVkDUjYTERHHV6JM4Xoi4ZaSlXDyWFUpgsJ3TuDTNoWtQt/GmEHfVX8WKtgSCm+ej 6zSsA2Px01Uorvtc2pGT1fVZBGBfNTMPf2IPvAIL+U43b5KE/T5aWncGe/RQ9fOpHVYT ySjFr5vco69vaeg/6FDAvOcvKrkqgqY/8kWICceTqO8wkHwJkMiuJdSZQvTn1pYZ7EAc 98jVbvaGLYYA93eQfeAe+GEn5X2LbYxW9JrG1Ykz9bR7JGuaxHyakp6TFly0o19PlZpF jMg0bVlhPEbphVTYo6oTt+ZLKPsXIxop/8RGWU4om9/G1ItY+Ow7eFoV680i7w/O5epO UA+Q== X-Gm-Message-State: AOAM530sF7xi6Qxn8tLW4xwrRophB00ZLZ9slGVdNTB0bawcgNnXxJhU Y/5kS5eBjo2VQZy5/lE4THfVzwT4ddCYDg== X-Received: by 2002:a2e:9811:: with SMTP id a17mr15851935ljj.269.1621827315391; Sun, 23 May 2021 20:35:15 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:b965:d206:5235:139e]) by smtp.gmail.com with ESMTPSA id x7sm1303331lfu.17.2021.05.23.20.35.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 May 2021 20:35:15 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 May 2021 06:35:14 +0300 Message-Id: <20210524033514.5514-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/src_movie: fix always true expression X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JJL5coBKHDqc Introduced in c1f9734f977f59bc0034096afbe8e43e40d93a5d. We are in if (movie->seek_point > 0) but seek_point is timestamp. --- libavfilter/src_movie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 54f6738f9a..105d1b7b54 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -252,7 +252,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx) timestamp = movie->seek_point; // add the stream start time, should it exist if (movie->format_ctx->start_time != AV_NOPTS_VALUE) { - if (timestamp > 0 && movie->format_ctx->start_time > INT64_MAX - timestamp) { + if (movie->format_ctx->start_time > INT64_MAX - timestamp) { av_log(ctx, AV_LOG_ERROR, "%s: seek value overflow with start_time:%"PRId64" seek_point:%"PRId64"\n", movie->file_name, movie->format_ctx->start_time, movie->seek_point);