From patchwork Sun Jul 16 14:24:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4864121pzb; Sun, 16 Jul 2023 07:23:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlGUrJegQLL9yazFHw6yWp/ErZIEW9v43+Q6rLfIrhK7cyyLGS4/FWXeu/NwslQgn1MKuXqz X-Received: by 2002:a05:6402:542:b0:51e:3427:63ea with SMTP id i2-20020a056402054200b0051e342763eamr8776782edx.8.1689517424358; Sun, 16 Jul 2023 07:23:44 -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 bf10-20020a0564021a4a00b0051de49abbd2si4442590edb.483.2023.07.16.07.23.43; Sun, 16 Jul 2023 07:23:44 -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="m/C8eAkn"; 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 3069268ADDB; Sun, 16 Jul 2023 17:23:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2027.outbound.protection.outlook.com [40.92.65.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA43D68ADDB for ; Sun, 16 Jul 2023 17:23:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UNsUMdZJLrJXm4S37ggK4cBBzirMFvacjgzeU4WiutUOAnsYI677i27vLpNDkjNq0QC2AlLhzpZkj6uVtF+TVHJuLDXYh/sYW92eDjrKt2JNNJ9o4YLhnYNnb315VV4pVWaUyZcafVn/t/CDtMu2rfv5WVNRVhbMD6l4t4LTZJrKN+tVPj/0hBia6GQGV0J3lIXSFIFPGITbN1gRhUlP0roMPqS9+67OASAax3j5Ey/zQrvAszeAqZYn9gFEv5i2eS5B5KxfWblFzOj1xi6synNSyCGJe7HSm79QBlOl1QP9gKRbNZEkiBopXTpz61jo3co/d9UQCjQNWSKrgcpGhA== 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=83vc81dKaHHpgMY9r3/iQvV1PDvEhzdn8mqUMLKB7lc=; b=YeJXdBagmgjChcU0DkVvfYTilEssas/cUcCci2lAjrzKf3ID4alsjsN5nH692BUnWJE+r2ysTk+ZOQCeN6kGmGZMAB2QYN0/qtPJ4TksuX53i+pGTMw8Lce9gEnQYOf6SRlsQcA3MJqOg4JzhxKslQoExLAHOCY9zDIJUNaL008zJbUSkEOOQGgz4LgVyxXoyRWlTAacoCphSibcwjoMQh99fHGD3JezBNIcU+MyTP4e9fyeIczhQZYBefj1DgbAxeqddCIxWw+KUI1HY66JTMKoKFOUmEZ5eUL1/w+1H1j5OUVHk2wJE5ZiHVa5+sR+Phxi2P9HXQJA7rh6Dque1g== 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=83vc81dKaHHpgMY9r3/iQvV1PDvEhzdn8mqUMLKB7lc=; b=m/C8eAkntsWiIB285unHdjzJsJ7E3+ErRJBLrLHC38PQobe2uJ7s+ra5BaNCHNPDZlmBgWGQlTiLyVVKv3bwNOVR1WxZ9tGC8Ef/uFc4G52E17QVIBalp6g8jcAkFn3d9+NMnzmE4tCh4VEOicOZoiurntdskQGigPVAbDtbgvs0K2EFjZenvzV0LuyuTs0qqK5hOY8AWe2qYO3+jG0RNoJC0Z4tn+GcjuXcAi1n/r4oPGSGlTdLKKapCRiHqVUxJGySKIxrVrAreyAd34QF/4HiOy4S43Q5WTxapIsS+s0O3n+r/0ybUPw+gjZhwml1nyS4BV3SXOVWy1T0aAvOpQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:23:32 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:23:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:24:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [hGgb8T2vRDLKmsa4L8Dav96TWeK/0aA5] X-ClientProxiedBy: FR3P281CA0185.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716142436.4105246-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ad4bcb0-23a6-4179-c8b9-08db86083b5e X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQmNqaaQY+HdTyQKiZ5F01BK1thXF2aLBhbwE4F28gfj3D9zIYPOYu8Yfvmr8+RXwKDUL7ZTxiyLsjRHXtKJL0kgnoMExBjnG6bjNZ0StShLqVZ24BH8MWIrk736XXm0OWMSsjIu1AvEmz/ptKYXMLqFHniVsZ4C2Q1aloiunVfd1qR1MoqBJviWcBpBf3n+TkBYmQJFfC2eNW22tKhCmZUkKM1wDRK3mQMcJL/3/3KhgMOtXO3yFnrhloNnwZnRKTbs3i5HWIBnH8CrJXjhLRA2+UlYEWzSYvX2Tnt1neBv9XRDukN2jtJ/+beyaYdilfKfOZ2/Wcr9TN2SAHVIwy4h4ApTbP8wCycODLiBTfCuoKZ7UknOhDxUGh63lnbw05GsJlQ0RZgAtY8vTatr23268Ofm9BRzSuCnuid+35DOYikhLdPv1YdbYCyZDjbwE9/Mtbw6My0VW+IT8W0kT54k71+4lEsebBCL0txHsbGyIXEFpUJ7K9skEOiQDdo6PARJfiLKjB9LDMy8qa2qesJNdE6/UyjL6F3BPPqdfd1QD83Pdk5dgsTsyMDAlcZ2Dv34sOuzgF8JhvbZbUOmUHzUWFh3OdvPUzY6u8Yp+OawzFwQKz6CcMZMfupbJi1A1LkItRFszwJPfmCyWTBN17sSi2TPegFhLZYeBB3/8meugrpiPGT5sqRa+4kBhTwkQnObGsVtShiuuhfv0TIxbvoDEx85vz7nous= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3YX+kSb1TuWD9EV7SazgjXHFiIVHzxFDgif3cMTkws6eSYn5/nUcF1cNYxRTbnVKB845uf6A20+YjcbyOlVsJz4wbhOqWSeH5Wg73T4sfHLozqcsaT084Vudjhhf3QCY5l2ilKpZiR7NBxWhy9r9gXc1JN7hUYVztdZhONUae4i8Dpersffp8l3pC+FmD0oKMKDy6OjKybXjKbzwbuqcFdSqtWQ+SGT6pUSkcqG4IXlzXJMtNJOoM7vNMmzGA5M6jydRt36Zwl+SJQtNN2n4Yv+PeC8HYEoHl0GeEF6P5GKdcYVyk8jSz+fOTXFnGAMGR15rSsauGCnW3R56Y8jvNQOQ5vrXrh0ow9/oclKXZOEOdtEhqiZ7/0E/x0RupcfIhivQC44lJkdmcElRQO0nYhsOkjrxGd051/omSk3O6rn2IkcUWhmesyazqkbXhEVNmEfHgy00nb5Y0PheFPvMRcnwrj2qfs+ao4ONwECLbnD+LI2qa7S1JyL8At93ixMHVvgsBsr8Rg1L/1ybpG9hF0QjC+91WvyYYMf8By84gXUh5fM5gF+IqVAdq+o1liEwCcT7D8ujzX2KJAZSLuxfuySX0EFB2wcUjGu1aLQugB25VoHReiznhU+gzQueEJKu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KJZMf62X2kK+XdchgQJJ1ERQCbpb/GLq9FIHH/TO0KTHC6snDd/qP6AsVVrJVnFU6RMnqiXNGA9Z+gy5LXk4L8+a9p2KXko1RCyoTc+tf7/3lABl8NeMMzorbtz23/+85tFTHTtV0MhOSoqMPKyshbBmrKnfr5TN0QbS9wlYXKYzumF73xJqh3rP6pJ7/KjfHB9HBKMzySMpHft0oEKSbyjX4QAkDJhiHhOCPeadazuHz1vS4zQTaL3KXLyi0/p00Q/NYGHK/uB3Zowm8sDSodwumiJQsNR5i+ZYhwC9/a7WR4EoPUVv9sXoT72xSYCX+ftqgGIsuZF5498Prl2XUgiQtAtyXLHVOPE0jLbGuZk9mbfCY85YFNgxuUj6Seoo2dIQDWOxDRlb4jKrj6XAooaWuZOFpYWfZTYS2dKip0/ygQk4NI15fxkMxwHGlo+MNIuBhFyQ0EaT9p9TIm0ByJfR3p+TswJm0uP2Tvjtc6PsMjMKl0FeFbNnKwCHACU7SS2bK8eYd5AL7QJiw9cNB/9ItridSOIAgacrwDwISOxu05opLpk3iMzCxMJ9EnJND2d0IVFMmhMQgnQiODmou08nZWToBOAJfYOYpcsYI8apYnVKCeOHWcQ9mKP3tgL+y7zdXf6Tk4+SqaEFE1GvPZ9wY+OWm0WIK+zFzgBejm0IXlSqITrbaPdZyJboazErbxH6KJRLb4NaNdRSx79BXz3RWOuWuDmwrtvkLzrfoU/JUtbs6cMK+8zBVJ5lVnNt3wstDBUYrxiAb/pRfvh5o34/RiYzXfgUTmisLtlXJNScQqqVLdWz+NCMobh+3h2xG6D/yvHw6byE31sfZrhDp1hamo8KdOfyTPClpJ3snUO2lzTKBTvxd7T5jvBDCfaqJM/3Ytuu7eGUe0NhNvwCV0jhmAcYEHTXIvd73JBCBLbTeuW4x6R1qr20b9Yo3nnp+gXJaMGMSs6aclZbg5+TA39T09rhBEdb66WPEwducwoMqQ7Dwdi9OCosf6NGhlU8eC1puMoZE89fkU7ujg9oIlbzvdmUUtxOfacs13IYmJlqADphpY1MRbVC8cGzhaMaVhUILGPDqpb4ZhSGB8pX9IM1q3UohtVr18cuKfQBP/hpgQM0s4MRZoIP5pSRBebVRErNcypTP6YUb7t5J5IS8yIcTVZct3e2Ce1gqoo7rMBeBSWAUBoDjFGhxTVLoC2U5uG7aSeZL44k44hSa/WpoYE48UVp4C2pZLpDVNjXC/4b/pnzjh3+R7gnaFEtP+bP X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ad4bcb0-23a6-4179-c8b9-08db86083b5e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:23:31.9863 (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: DU2P250MB0336 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_enc: Remove always-true checks 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: 9XhVmMczQXlO frame is always != NULL for audio and video here (this is checked by an assert and the frame is already dereferenced before it reaches this code here). Fixes Coverity issue #1538858. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_enc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 1489b2f179..2c7e29af24 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -304,20 +304,17 @@ int enc_open(OutputStream *ost, AVFrame *frame) enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample, av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth); - if (frame) { enc_ctx->color_range = frame->color_range; enc_ctx->color_primaries = frame->color_primaries; enc_ctx->color_trc = frame->color_trc; enc_ctx->colorspace = frame->colorspace; enc_ctx->chroma_sample_location = frame->chroma_location; - } enc_ctx->framerate = fr; ost->st->avg_frame_rate = fr; // Field order: autodetection - if (frame) { if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) && ost->top_field_first >= 0) if (ost->top_field_first) @@ -332,7 +329,6 @@ int enc_open(OutputStream *ost, AVFrame *frame) enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT; } else enc_ctx->field_order = AV_FIELD_PROGRESSIVE; - } // Field order: override if (ost->top_field_first == 0) {