From patchwork Mon Aug 15 11:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1225633pzi; Mon, 15 Aug 2022 04:52:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR7kxbn/xbsDdTkJEM9Ndpws0/NXWIY0LDNoc9Re+75t6VD8dIsNhXXpCrLyxlUApZCY4PXp X-Received: by 2002:a17:907:a073:b0:730:a5a4:4b7d with SMTP id ia19-20020a170907a07300b00730a5a44b7dmr9835191ejc.533.1660564373168; Mon, 15 Aug 2022 04:52:53 -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 l26-20020a50d6da000000b0043e4a0bf811si7789918edj.186.2022.08.15.04.52.52; Mon, 15 Aug 2022 04:52:53 -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=K+cfeUIl; 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 305FE68B979; Mon, 15 Aug 2022 14:52:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068071.outbound.protection.outlook.com [40.92.68.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3EBD68B94F for ; Mon, 15 Aug 2022 14:52:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TYgpV3CEVKFiZm7nDO3566ewDOlscSVxBaA4grq51af8ECtxyFaT+T4KW0UhlfXrx796S8QMCRK5eES6uAqz1XurXX45HagkJudTvm0SpJ2kDDZeSMdBrxx89x26pdS62BIcDD+wKTq7LMaDpLY+UJc0fKUx8qyZv9cU1x7EgYyuUifuTlqFLgXfxF+MjgJgFV7Uh5RAKJFOhWDb4fYlcfRyb6v/Rc3G8cV4a3dtTdhrjyMvGbh//Ut9pC36uqf3fbf3mhUZBUIfAn7Vpqu81Z5kEu+BPSdl6ezk6BI+tuIS+rIiv3ay7U95iLtJa6mQTed0UteNou/bb6Z66V+P2Q== 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=zSMFxosJHF6NblayVH8w+vFbbUq+f+Z/TVFq2WyxNNo=; b=hEvbqac0lRJ0APlysVit+oudlXm07IASHqsWp9WcGo2ESJgO1OLyXTnoWRUhTir+MjX2CuHyvSo5+R9rpZSrBRh8HXBzewsFpv8O8JYBF15ySjBlOFDofNszQmOUTgl0AdIJ8ZvJse6blX3e6scWWyG/arCAiSGcyef0TKflyeXZW/cdYYtjGuBdmnMke5jYLFGOFLcmUcUhuwT4R7OmeYaZYDcCBqhfPGn4ItBM8YyHOzx9yfYfzzeW0mykBUYMwrLrNv1ipLWGrvjGojaVIAs3Sf4eu7gm4MYRDcptnkY4HEIOlgJp83hKqHn37TMxFSZvnJdkJwj37yXFqG5CNQ== 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=zSMFxosJHF6NblayVH8w+vFbbUq+f+Z/TVFq2WyxNNo=; b=K+cfeUIlUJAGIR7GdXqsZW/agsMjtwSMni44T6qKRU/t+nD07ANd/J+RRDRu/slhgMkLDEc81Q2Bi678m7okBN+v72b2T7LYxVkNd5MJn4lLe8O06dSlSGJMA1SEW4Js8VHYzWam+nmFGiXrm4ZcMzj5Al0INm0UybumVkaYo3Ufpx8THGpl/HW+BV6Eec+MCgqnPxuxw8232JmBUUkpBKkp5sJQiEhXVqfQhl9PfCNK/++E+/rGwTM48ZXJaq9xCHMCuwJT9c1OUI7h3nLludiCbqoRysmlTR+o/JEi7pNhtAsFiqGGL/dQFaR9+gtAW3EVKPX2P3/yyVScc5MMLw== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by PR3PR01MB7937.eurprd01.prod.exchangelabs.com (2603:10a6:102:170::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Mon, 15 Aug 2022 11:52:31 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e%6]) with mapi id 15.20.5504.028; Mon, 15 Aug 2022 11:52:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Aug 2022 13:52:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1WWmg2YvXteljpSOxpJOTJRxvIL7cOMG] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220815115211.2237279-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3aa453c9-e56f-4c20-5632-08da7eb4a25e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEszruPA3NiRbT6wWmkcvgVbIs/Oln+osrCyCqAw0X7moBthq1eg0aMDhKliA4VxVddnGpl0kKVXW1Sg/6U2m8D53uPy6csQSmKwQzENnvFLk08efb6+e8l3i+7xX7loIaGodijPxBMukKb2ClyIh/gc1bSUrcvgWIZOW/hyi7tMNcq8o/aauZ2RldaQ4JPWl6TPNpfPF1gS3oJEnmoNH1NX9qmpIlze/lSbSwPnEAQ+5XvAjsQrc7zvFS2kj/41p581xCAlbIvL30faBHP5VoIN0eySNNmMinG4Px4Kopr08q6dAmppDFKju+/e/Tb/aW9IHfMr9+Md4oj9OxUWvvTQwezqZjQ8AFm2TlXUb2osDSy6g7qarYjwzkaZlS4VVoc4akpXoFHCrcvbpZpvMzTO+5kHmbvzSlG5QLCvu4P1XKtJpX4pn6WB/LeNH+pWSR1ZdxgNqxz9Sgpuqt4SQQWK7a2KWT6gS7S32gZfVIZlXS0K/DdXCQeP5Kmaou4O29e5Bk0tD+Zur2pts4M2bfLun3cyLGKkj+hDOtBCXVEG3t6fEO/3e7XmVt4xYdz1DlrHzcQshf1msZA44o5PD1SKlH9swjvijNLXZJbPUQ23j4HibaVw8Uve0Jk26Xj/N28G20QY+vgqmcEFNy0DbO2r/o8z4tMhpFVhmvXbaVMNtR24P2wriVuroCppaIMuiGF6vDfZQCQ2oxcyoocwQu8ONqLzmKa050mpaZty+3pH/QA85nla4hvENSIsBS1WmyypG3jQ78Pjq9txWpftX4A9 X-MS-TrafficTypeDiagnostic: PR3PR01MB7937:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MGSzp90Y/yJUUYMzB83UM4djl/TtTTQtOoik2wMlVG1IrHpyp4OQIrRC1I4+GxWEi3PIVje9qLkZRblDxk3TkC2UCv8Kh57L6heVCdhJoCDf0sTualJtrwMxMMahP092gHf+DlKruixUR11z3wMAK7414DueQMPNsj6HqLt91Wp0BWWhrP0ERYkQ3AB4oBMdEKFxSV8EBVbhzk/jg9r1nbAGPZL9BiI37UQE8oHU5Y4tFXVndBYdQSOKFqIq5itbAS7h65BeSpNpWs5OUDReUysQ1T/ezr+Fcp+RPjiFJ6dqjUbydYZXxTGP9wsxLmK1lmtO9nq70fte3qIqj2papkdmlFlyvJqNT0U4lr62Yu5voNAI5RYKIHfWuyYT3YO4IS6AP51wEEBVQ+jumUKpQg3Kuc6u0uGEU1Dn0s+DTwN4tOE1RYiV/rZn/qLxROJDty/ucjqMmhmOmzalOv7zsmS1xDiBQ9XkSsdsGq0lKxv5BUfzeIPjmYesux3N6ZjK4xZB1fHJrKCgphJJm5Av/oCUy+pqCzFfM8+74Z85L49VFKhJemN1d6FZ5WyIsaqpNmc/p5g+2ZlBxJ+jPU5Fs0TPKkT3fO7yG2zun/tm7XvNRI79kqKb7l6coIBCO8g+C7kbWXCrc/S87RwIqlZeoA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I1uqSIb2OhccWxrcRB0cK1KolliqMiUzrnElnDJ7z9/8JAiQFoBdGKrteaIO54N+QQ3WrENzDReK5W4AsMyrWDna30l6V1ZNS6UvBDtuZEcEXDU3TqhX6cDJqIFaeKPGeoZihUeswqacSqdDeXU4EitquYH8POvb3eooO1OiLKMv93ZZ+oE9MrT9TPOPz3146BZ0FkjvLGNIM/G9flvRMC8YGIO4KyprBzFoAGKcAd3spojbHzh9XLxGQCCQ1PUyq8MXXANOxe+HrQXomhdCXRaNRcBycqboQzavGAN10t5nzDmIhGykcC7KDwDsi8poL96Km2Em4wPThFfYDnaghEjBUBoy2FJOGCe+0VflXcutdDYEQ+Yl5xXi6zxuMGUTySgyie5I7KLDZqSnTgJZpsN4GjRk31VHsHLW3/rVacau60S7MloQ6f+z35IBrNZbk0ulgCs9rSi/+roxZMvqaBoF1qf/5PuwDs8fVcaZv7tc19YA+cAdMTUWw9Z8MngaND6RcivN65bkDfZnWGwNBX0OFaD93c6i6Mt7+IscFRGTgdlbWUL3pnpFM6ftqrDPxkNv7n4snbY6yN+haaQmstLwgw1ym8/VfeFUG9U4mxHxloEoXqf8YKRy2W3L5MmYqVdfqjj8QZAAjmtzFSEHuZQyY/npxAB+TLM75wVk4OiQ8EF5jqWhVUkvajbZE9px63NsmEhTU1cuHtKup4JJYkEafL+DF4D/8kanIyPXuBCwKGDKcQIDPgk+Mp3vRg6GzFi++IKPWHW1QSxcQq4ho9hV5pzTb+Ii03MU4lHA7oSsUDGNRsW5LZqip1MIP+zhKxVxmttDkDgZmtoJy/GmqYnR53iOBAkUTIPSQI42Tb11GCu5YIcP3PNIExw3rc/TqbMVv1OjvATTpEcZsPNaQhNS9TXl2sk6heA7r0FDRjS6v102SsK9L+RrAYc9CmgoIGHaLTTOCtJ4rlIgUOq9eIsopK4KkgjpN8v2r2eS5r0uR7gyGJQlIiAdves4pd7G7Py+LNyKA2/vvy8OCRQ5ZJCmIabI5B/rJtoEIJUCIab7minGT7acoZOzydbxh97AK9HUph6/9+ixQCRZDGC39lYIi+qiHPQaB720HiT7Up5yqY6+lcZV1pkrh13x9LU0Zl7PQkTIebdM8LycJvCVODcqOxnOi9iHvXPpnJdtjNKdlctZz4LCJgRGki2P5nL+Tpod+bHT4FRqpvFhPyuf7R0tyiosBLxKrsS0QMVrSdSXPDi+3PY+g4dR7ykhWsPPwGM5qEsFDKes5DziKadQHKIfza0UlEVH4z+2jItrrMQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aa453c9-e56f-4c20-5632-08da7eb4a25e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:52:31.2932 (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: PR3PR01MB7937 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/get_buffer: Don't get AVPixFmtDescriptor unnecessarily 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: a6x1htTrrgoe It is unused since 3575a495f6dcc395656343380e13c57d48b9f976 (and the error message is dangerous: av_get_pix_fmt_name(format) returns NULL iff av_pix_fmt_desc_get(format) returns NULL and using a NULL string for %s would be UB). Signed-off-by: Andreas Rheinhardt --- libavcodec/get_buffer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/get_buffer.c b/libavcodec/get_buffer.c index 3e45a0479f..a04fd878de 100644 --- a/libavcodec/get_buffer.c +++ b/libavcodec/get_buffer.c @@ -246,7 +246,6 @@ fail: static int video_get_buffer(AVCodecContext *s, AVFrame *pic) { FramePool *pool = (FramePool*)s->internal->pool->data; - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format); int i; if (pic->data[0] || pic->data[1] || pic->data[2] || pic->data[3]) { @@ -254,13 +253,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) return -1; } - if (!desc) { - av_log(s, AV_LOG_ERROR, - "Unable to get pixel format descriptor for format %s\n", - av_get_pix_fmt_name(pic->format)); - return AVERROR(EINVAL); - } - memset(pic->data, 0, sizeof(pic->data)); pic->extended_data = pic->data;