From patchwork Tue Sep 24 07:09:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ad12:0:b0:48e:c0f8:d0de with SMTP id w18csp174026vqy; Tue, 24 Sep 2024 00:19:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6JVYizoZSsRpYngsaRb1vt1qUnTbAy0yA3wp0eSeg3S4KwASwYpqSBAPU+djWPCvjxbUkbTl6Hw4FrP2JaTr3@gmail.com X-Google-Smtp-Source: AGHT+IFLxbM+GdMpsTZ6Y8pga38sSbl6xHICJr10GRfj28z02XT7chBk1QIDB0b2549YXqTb0gAV X-Received: by 2002:a05:6512:3c81:b0:535:681d:34b6 with SMTP id 2adb3069b0e04-536ac34a610mr2323708e87.10.1727162367950; Tue, 24 Sep 2024 00:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727162367; cv=none; d=google.com; s=arc-20240605; b=UO8ZJIGkwIYxl3cRNPMyHNMrrduo8tGez3KpIy1nCa0zkYML5kQD1eUxznnGlJGmI2 6KTOvDYYubQAcin9jZeF4Z0QTKlI4xJgtUgTQ2U8zWukuwnJES/yBrMN6LvNLtnUh8gn gXOfb3cSRCRzc31dK1oP38jSsiFZVsMcPLe7TSYxmgScT8CZw4n1dFOXnqXKeRfKG/qJ +8W08+8JhdS2wfl49CJR0i//j/7OuRDnCi++s+TnMWdCp/dl8RNUcULnglldNKXpTj8v pvoMcWWqLee/cmbcCUflh4/0A2jYSECNOBr0L9ACbY+hJ91XMfEG1OlclxnGUJgV4pfE DDEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=nfYeIv8uNEojE2qz1I2WiWc0nw1mqqexufILs1a644g=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=S6Zq4j/4hH7iUSq1Vxx25lKhajxMz7q9Linpc0TLLvL69uhH3xajepRXf7/Lxdbaem 18DI/iQ6XCvWupq1PK94lc87klU+BTnnIqlmn1gf9uJj9bxhBeymqNLYdbYaBvuj8dml CvS73i8Pl2roVgdV+8RFbCaWUXjOGJ6ZevLb60bJDttsZs1VHCQIokRL1q7H+4Vh6GAH sIQ5N6XCw54S7ISbXjvk9acLCMUScxx4h02V05X3PHXjZInirKx0Ciw8SyGSKIo44zE3 YYUb6mZLFJ2KrKqQu5iHpwWKVJEzpL0cgOVu8JxxmnD7YtdlyTD9GRQDrQMpCtpLsljt gJBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="B4dy/UiJ"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-537a863f29fsi289837e87.310.2024.09.24.00.19.27; Tue, 24 Sep 2024 00:19: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=@khirnov.net header.s=mail header.b="B4dy/UiJ"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08F4968DBE1; Tue, 24 Sep 2024 10:10:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FA6868DB45 for ; Tue, 24 Sep 2024 10:10:22 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=B4dy/UiJ; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B71644E02 for ; Tue, 24 Sep 2024 09:10:17 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id lUbODFGugn2l for ; Tue, 24 Sep 2024 09:10:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727161815; bh=txQ/DIC+omS69s1QMFnGbw/uvGtqNO5eSnUFU0xI8Iw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=B4dy/UiJskNRtJQGu8G8Agb+hQi3NTUsWd/xokaopjl419X2idCkBxYFRApYRVxz+ le0yHVl5N4hk2LQf42c3GbDI0p/SPolOJ0afTVPIuEqzzSZqpFkXdhvJk/wWS/3JqY JQDOwQEkjVJvAT7pkl1CO8xhzxm33wjq3Qr07OKU8mYU+oQLEI/yYMR33BheguZbnv 8ZllV5at51JYYAAbD5IoB+UWkA7cjO/xF54idOpicNRytcMC5IbWy8UvQplvu0rHhu vo3WjJAQPkK/p/1PB8TOK4xv3vjnGPXsV5kmNPm+6qGIr4Mq+NFgIIC19IxItmyURk USh2q5vrKfl6w== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 814DD4E0B for ; Tue, 24 Sep 2024 09:10:15 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 4CC083A19EA for ; Tue, 24 Sep 2024 09:10:10 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2024 09:09:51 +0200 Message-ID: <20240924071000.11428-10-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240924071000.11428-1-anton@khirnov.net> References: <20240924071000.11428-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/13] fftools/ffmpeg_filter: drop a redundant check 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: WfGerDXVhuwE OutputFilterOptions.frame_rates are always NULL if the conditional is true. --- fftools/ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 4196fd865d..7a37cb1d2d 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -856,8 +856,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->fps.vsync_method = opts->vsync_method; ofp->fps.framerate = ost->frame_rate; ofp->fps.framerate_max = ost->max_frame_rate; - ofp->fps.framerate_supported = ost->force_fps || !opts->enc ? - NULL : opts->frame_rates; + ofp->fps.framerate_supported = opts->frame_rates; // reduce frame rate for mpeg4 to be within the spec limits if (opts->enc && opts->enc->id == AV_CODEC_ID_MPEG4)