From patchwork Tue Apr 23 00:02:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp98889pzb; Mon, 22 Apr 2024 17:03:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXaQp0AQqo2pLLONC2jMVR+fd7tghmRZUJqP4EjMgG6HIW3DrCW6egmRf5Wpqv9VUgqCGxjkbTGaYcXduvuf6qXHwXA/YFm1GMxpg== X-Google-Smtp-Source: AGHT+IEHw3oTuF7TAvX7hpuSuMwyG9xlyf7wIRCi6KWbOaf+i2Kcpd+pNQ9X7dv78P1ZY60/OTgM X-Received: by 2002:ac2:46f6:0:b0:513:d5ec:afb with SMTP id q22-20020ac246f6000000b00513d5ec0afbmr9159590lfo.40.1713830593278; Mon, 22 Apr 2024 17:03:13 -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 r21-20020a170906c29500b00a522962e041si6334934ejz.893.2024.04.22.17.03.12; Mon, 22 Apr 2024 17:03:13 -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=@outlook.com header.s=selector1 header.b=UPBzFUtO; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E4A668D37D; Tue, 23 Apr 2024 03:03:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2020.outbound.protection.outlook.com [40.92.89.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7D5468CD11 for ; Tue, 23 Apr 2024 03:03:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hg+yRqAEK3STizfLX6xUByLD9t8JGcHWwuBJvHdgCEnBt9glBXki9Q4RG+g1KdVeKBuhT+sEICJLShuVtQF42OO9AQJU+7F8tcNzi/Bgy6PvYkmGIRLuSTB1mPDu+ntOlWKka8Xe+T33HADr0BU6f6mZH+2VWUD2NPOwwQiDnOS7pXBR0GAGjTAUT+93LSVJa1O5Eac1e/sssUXhn4Hhg6sWwfX58YpVs26nmNgZ5S56jIUCnLhJkw9BijNikpIdG1EzUHfep3OMv3VLjal6hLHomGTsxqiW1JELp3YEKq7sOsR/Vzwtx67kpkkcD6bC6dOWO8Z6L2zqGdq3xJUj9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wzrx5uZmvRI6X18DBxd43xVEL6e2yLMD9/1NB/24GMI=; b=gleemrOFpkUi42b/IexE8J6VpZUETL5+s7wLAO5epKdwaRRJuohlbbL1a10xq1HuyjUgsDWkrORU7ed0afZ0F6vneOCD1QzyvhG3YBNCp57wOQYb2RmKSyU9mac5rOTQDdJiJ9sCEJ7cVkEqjRk5Nux7kSyBbdzZxAIhVwqbnhQghAcxUhS6f5Y+juE8h//2jJmdRFA9UBe5fJxJN8uO3hx/55EIipXMLHpmWAyIPFTIz0yW3fsNX8uF8HnBwgUTut1fnRTfnIefAdAzfo8eXR+j5gNysItPVCE0we5adynE7F4RSC6kPW14yuXZEP/G5HZdyzxnDrkP0W6k4GOMRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wzrx5uZmvRI6X18DBxd43xVEL6e2yLMD9/1NB/24GMI=; b=UPBzFUtOb9loVB4MjURqV3SsVOX7fBC4XUBkcoIKpMW1fqEcQxNEEOJaaveLHPitvMwQ93iA/UticB6jocsNbnq/UmT6o99BSW+LuN2oh7ZVHD+PgTKHcCFsRb4IVJuiVA1acLXKRSryAKfIVqMANA09dGA6bULfKX+570A3QdlhNIfu26wSdkzqG094+j59Rwk/lTynXxQ9xpw7/xAe1rppVZh9e2e+/ierq3CmCDAh28E4izAJT0wVR885PkMX7F0kv3Ta7zAScHdfAvKTC3laydhwTK36t3h9WMQFiPb1BspRfdPCosLvCw8qCDsvDx3ggmkQEqRnlo3OI+jHvA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0219.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.44; Tue, 23 Apr 2024 00:03:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.042; Tue, 23 Apr 2024 00:03:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Apr 2024 02:02:52 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [1pMxOaNgmfhuH7jLcRxRKVGb0GVhyORCR+8avfiDzQg=] X-ClientProxiedBy: ZR0P278CA0193.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240423000252.558784-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0219:EE_ X-MS-Office365-Filtering-Correlation-Id: 80104519-9ee4-47cf-34e5-08dc6328bd2e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TmZIi1w1wMXmx7+08HWtAuNieRT4VhwGHLYclWyjp2stdCT5mZWBXtqGv9YytlJ8u4otLGvA47MTZmczrIU8jdyWSlfbLgxVBEc4/W5gGWl+nzwv3iErbvKXLjWY6amVUHcvgrY7jYK7KORVDU0AYZ5dNxcZ5Rt/Osb93gkXWK0SD1bK79aCiQLbXF9phFH7K3ADLj7LLkMIpBKa6RGgafrtpUq790uiSN9lS/xEXZCSB/FjDnA18kLHYvwhEbcAtAlyiWyLEs9Pwsr1UNG5uNcanAXnEYuOo8huwe36AEIEa065JZiGUtL+jMnz6P/yZdw9L1qH1T1wwUuwka5RfeC7OKuqLiCAPMCDHbEGWS4gvYsrEQmXtWRaVdElDVCR0WzJO1feKFc2RZWu8EXHr/abQkLnNLHaLqDBO4N4bMMdJZqpH+4ZO7p/dE6BGImAz2ngM86CL9HwhSuNDoNjTJ/I4BXFFg5ej/CHumB71iQ0ZvwVNP9MakuS2zCKXS2qaLOoeEURfcB4H/rFhxj+FFmLyNJ9lzPyrEcg4Q0zOFA4kMcarztjY43NTw1wW+6H3AG4nh9cI2Z4khUZWRwKoows+Hs2yEl5ZEsfWCY6Tif9JR6muAHG88yuWjockjGc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GcAitdf2q4jv2KNsWx1q2xf6Vh1tw8oOQ6bDPvQVd4jafte++lbexyDD5A3PvwAX+LPsHABnxX/Q4zk1dCOa4qyjOP8zmCk6K2dfzlLZLV9da9WjnG5wEyYj3V/daR/cRFMldgUR/8Y+NkiZnIdldc9OKqfsx4SpnNxLzuh+ypJvbB6bonTGznMkIIT050ub1nYIXj8J0lv6qusvT0XFpK+30bZU6kBCPB/Xe+6LbwKscUMY2YH6gXYXxdPMYNa7HwnE/mm2XATlmvEKqkFLkJhUf2N3UFcQqN15CCASZc5/F0WbJewCLO2771koLutAadgaFBMBlMEn7xsvMaEZxxdaU2Da1cb78xWjbwPq2jf+8uZVd/r4HFEm9RGTeaTt8ey+TiDXf9LOhG9k0QpsU5zBddPJVUAd21uaHCECJcJGKJGvimT48AJ2za0px0sABlUv7C2bBODmV27mYbBsgrLpX81YOUmVGuqvnD4PKTufZxBvQIXu04AfwAo0v3Z5n1/EU+HJQcILeMDdUUgZeBLCRBjLYJz0ZnPgBNZss4M+Xg00abuFMgLH4JSahDJGwHe9jV92VneSGwtVlPEMZMdTzp+SqlirYcmuoWVTYeKS7IcXqjhOx5cczG2z1diC80UxJlFZHTS1+Bx1rjCdYAKCljAM4j/oFuU+/8jIZotyjrdE2xDuGjtfSTOIYxSZdAVfx3t9+S4Zs4Yq+1p42A8bIyUwMYPVdIBABpVxTL2x4558BYaaqWC1hPQ5AeDqTHaBoMdTdRuALyslx6KvDpk39QmTwuYibq9HxXV2Qi5giwCn66q6X0waWq3KxKqLu+BuspDH0Jw/aPeiheHMbWyWNPZgFJCmVivvH9CEy6tcvxRPcEGXWFoJk0elXAXfoW28iZ5+hPZWLQdWBRSKcia35kSWqBMwOBnBALy2YAJkUddh6z8F7lVELqqZUDgiVfJwipdEtf2NKz6hjLiEbMaNPqM+nZvvHwnA7I3mLIj6GOlZxdwYfY7HpWE062NNpk7/LzVGScQFYt8fJ8VShLsY/iWUp6dfnREG/YGt6M7NI8DnyDMvYCxU3S6ANu13GjC8exJtQM8ue00u1r9nMGrDISpG7Fu7nW6YVDXbBb6qdcQqU+gPql3gn4H5KXrx9DcsYyep/dC66ERtZxCoLu7cV7+u9QqjNcXdq8Wchw9pkoaEDKdR7Gj/W2ArAoCjJLzVZFrcOoG2Wua1zmqwA5WiFyFJdWIcQrdl2Pe9folYmdv5vxfqnm81FykRvcJr58zH86mK1pMVtb/WD0H6gg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80104519-9ee4-47cf-34e5-08dc6328bd2e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2024 00:03:00.5798 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0219 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_filter: Fix 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ect52Joanlb3 Fixes Coverity issues #1596529, #1596531. Introduced in 8e35e33d42efb89ff7e3da92b841a3b43a5a95bc. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f108f8daf9..382d0f75b1 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -862,7 +862,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 ? + ofp->fps.framerate_supported = ost->force_fps || !opts->enc ? NULL : opts->enc->supported_framerates; // reduce frame rate for mpeg4 to be within the spec limits