From patchwork Mon Jul 8 15:58:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5876068vqv; Mon, 8 Jul 2024 08:59:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUAU238VdUfqhtxV6yMONUbCRtZ4+7cTso2f7fPNATOL64BiEgQFKWs9FiDdowSDSMCO10/uJ0M5aHhSqbx0S+lX37Wlus93UXXqg== X-Google-Smtp-Source: AGHT+IHgbj96iKHVOUJwFcSY0aZu2FplsqSjOY95YsNcVys4zNBl08ypUxjp2h12Nc+biIBc4yAV X-Received: by 2002:a17:906:3989:b0:a77:cd4f:e4f5 with SMTP id a640c23a62f3a-a780b89ca7dmr279766b.68.1720454362374; Mon, 08 Jul 2024 08:59:22 -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 a640c23a62f3a-a780aae1811si5155866b.387.2024.07.08.08.59.21; Mon, 08 Jul 2024 08:59:22 -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=UM8WRuR1; 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 AF07968DB3B; Mon, 8 Jul 2024 18:59:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2046.outbound.protection.outlook.com [40.92.90.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C37568DB57 for ; Mon, 8 Jul 2024 18:59:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXK5/bb/K4vRMr2sNnlGg2QeEzkk9G3pd/d7ilQUqPol3ZsCVyBsnrZbuCtMEpRq26gipaayC7YkdzI14UNUAY8QScn4r+R2WlqA8ZF/sBrEE5WHNj1rnHHlteD9WpHvV/wC73hkRSLTTd563z3oNaopfTzGegFFIG/dDCsyK0lEpVImdW6ZILYyTrVfj/Ro6XNh1vdhAu0C8kjp5n3OLZ+djQVY/c/f6OVqusqU6mEu4LFPdzMGE714AokQLSLTvjJhxz14poRqUnoGuSJD4LVSA+I+fRUvou0WnlJevNtE03rf3xaAaQkJamDPkWwmvzdJg5fze1qGPeQ6Z0fnRg== 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=ECInAKqn4SX+ZyVQ8N6TvziWkhveep4PVyoImOr2l94=; b=FHXNk+dDUIBlbJL4A0z26nTwpc5H0bOjbIuDIFQ6KJKQB9l7j59b5XaaxalQOjvnWlE7LQ4E4aVICkQjv3XWyVputr7w9WiXr8fGPO9MKmo3t8eD7toDzRItZGhk0Qgw22+N33s02ch+HSaZHXyvuasWjUI18SduK/RiX7DoTr0CTD758G74i1e7WrsoStcPVFW8calN6DGYXp/RLhjS/1PZmF/eGpCk0G3lKkMrgmB7eRPXtZ+BzQuFYu3mKePpsl1HSh//+j2UF59J+5jOOaUTu78rYUWZVY1ehkZsJd1VV8IA9FlEB38OF/yTJs5UWJ/a4xPlp+k9D/GTMdO27A== 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=ECInAKqn4SX+ZyVQ8N6TvziWkhveep4PVyoImOr2l94=; b=UM8WRuR1tFE3ECWDtMvRzBbBGASIhlqi71RON/uzoa/8b4WgT3TGVi85bx9SkhV/QAFvqdJv9q8JYv5Ai8n8v9hITk2m8TWc965Ox9EvcaWdeZHrm+ELLEocZbGVX5dAFPDJ8KdeAQXzJYDViqEeUEhFfckoeEeBMGZ2sXpiZFghc6OZePH9fXYXJdUWMNCLdjYgJuEX/+n0aMeWs6IACh9PLU3NYdolR7JpXYVJyUUQlgjsg5+A6e66JSZ6JI7HJd24ibOPH42tHezLNvcgIVfVsppprEMnBJL9M6XAr/WDPtnSg0UYHyv50iafEi0FPlXagKz3rBMErH82PFlgrw== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PAXP250MB0495.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Mon, 8 Jul 2024 15:59:06 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6%7]) with mapi id 15.20.7741.027; Mon, 8 Jul 2024 15:59:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 17:58:56 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [aKHjrmajkvdH5oElHiK0wS42+KyNu2n1xwoDyZMNa3c=] X-ClientProxiedBy: ZR2P278CA0027.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::19) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240708155857.550520-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PAXP250MB0495:EE_ X-MS-Office365-Filtering-Correlation-Id: 0be00c0b-6c88-4f03-ce2e-08dc9f66e53a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: 7s/1KNtXxIHV1qPYCeNkLebHd+j9YdxoiZwxKjpDfsbc07Msbp8nenyjZwNFqdM/f3fopIjMKYWB75NwtQ7yGc5EMz8oBsp967rhkgmNTyPoN8SiQ5tXNcBCZvPx9yzVkGECm7J8v+ov5bt69HovDJumv5hFi1utYSV/Z3w6sM5b3e56t+g3SL2LJuJLnn4hkV8jCgJ9/hm/TgIdXJYoQ/EaAGOEbawv1GI22E6eV7aiN6teXVs990qs5EID6vROhMZl7Z2pZaKF2kJGu5C3VOyVEwenpYzdZCY6x4knqKNYXDiqp5ppkZKfaXdNVlPDZkY9pm+UD8Y9FKuWXYDjBRfTQR0i8FampPENvEeIH+s+RSiYqQ2JkvD/KJbENyccgBT0iKpIdyKykLhUiNsKDcIxqxQPEfNaVFn3OyX8zrotkDmla0GyYAmZWI41dYRGOpe7zBvg93yedsnjkeVcq+uqJerUgy72c3pX8z4aOts1H8CBa9QeACp5R8XFATarfY4ZCxUpzrMja9d8Y3GWeELx/4XX7URcLy/PWSfV2aPCshPI8XDSR0V2PgDqYWbCd/ufB4ENRixl8eHvYx+Ej3goAtMHGTwrpNaH/u7h35daeiAq85VURuOk3HAnQYVRh4vlpb0dYU8UtoZHzQXCxoShspqaAsvJhMjzXZC7Vp1O3gDi+h7IM/vkMEZx2jNp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i1K94MIOz6jJhLcGhHft38VWrzoJp84ULkz9xnedjGOAufwQNu+VIPvisEijvawTXHbXhzUmHCaRaWzjNo4kbUrVU93EFw7+SAcCwknpZrNBf7+0SIk1Cqbs9Ee6gjFEgAijDzZxeDB8lGr4mgDVlCHvPtfV2E/KyzQlUgDj1Quqzigiq4I6X02OXRZI19HrNphueWKhaLj1chpGq+79qpyPdnArKtdjlkx1SOTuYdZ8zhyTl8gh/44UYAmXJsunwkCMGPGH6ByvxUFt8N0VMAs9mxFqJxOqM4lOEIG4mwVSAsku0gNRLqB0PbFit9Q0RQmPBuqrXs7LqeHad8L1kXBo8s2HyGt0kold8JCTa9shgXNvmgcgP3GRqDodbpV4XhwLGIr+743sJvKAO6fXrZ0/pVc9IKQ/2yePemKRXUB4LMZMVQ1pQaBSMtv59TkNNiq+TCA9d6aca+TNN2c0KLROfdEonLCK5MWxKwaEmB23ZseigVdSrj3kTGA238ozDmFobDB5SLt5RGri5mOC6UIx/AnE/UIMbeJ67w72jNQv2qQ6JUs6FlOksf7oaMUJYeP+nggaNeRc0+5Bem9IO0AQWstLR5u4qa0qrdOwn+HIuM5PzwmsO67xntJ8yIu+KuSsAiIA8tWojW0rbQsQIty3dYyjqOmsnLyj9RK8g3b5AwTUqDskc4kKVTf+XNv1QRkpyFSdoM1nm4bdJR8czgU05QWrQvGCYnhQzrQccj3Vqi+l+Ln78O/d50mq82TMIURfT0jo5ddGr5qyT9gLj+YqqfiRQddTe5Rh/QYrNSBeilZh/wWWCsc+bPqgiocIpZDv0DFcqdInvcn8GbtJXVc54mhp9FISy+Z8ecctJI3lMA7DRNe2XmOp+4yKbbSYE1W99L6CZxq5wWIHbuytqA0VclP+Gd7fwHB5ERcYWKxuGOACwOq5zgdZCPgReWMXSBPBZX3gZRKepVC4IowB3Wz2/A5z1r3ZLpFuEd3gcKWpG3qDBWPQadSKUeVD9yZZHx5JcLJ3UOHtdFO0kHm0oPl13D5Gj6hWsaYVTOakiZmtNEMtPJk/qRns5XEPzfkhi7xQFnaAmAvkiAcKe36UXujzdb9MbHdD1hJ07F09bZnwXm+53TxqZnLFMgCctys4I4DfEOoNMJIASp0vUEg0y6pOTqvViLiSPJTJnDUOWd9tNioYcfsTZnaqIb3ofKSVu24HhdFH7EzHbECGoFbbllwqB7RuZMg1Dl/uY4azqrgPg/hVj2p0pNhCLdeVywic4ZMO5lwZ7jqnr/icVqelgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0be00c0b-6c88-4f03-ce2e-08dc9f66e53a X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 15:59:06.3758 (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: PAXP250MB0495 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: Fix member access within null pointer 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: 75P23kxHKaOx This "works" because the public AVCodecHWConfig is at the beginning of AVCodecHWConfigInternal. Fixes libavcodec/decode.c:1035:61: runtime error: member access within null pointer of type 'const struct AVCodecHWConfigInternal'. Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 791940648d..cdb682cf69 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1023,6 +1023,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *avctx, const enum AVPixelFormat *fmt) { const AVPixFmtDescriptor *desc; + const FFCodec *const codec = ffcodec(avctx->codec); const AVCodecHWConfig *config; int i, n; @@ -1031,10 +1032,8 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *avctx, if (avctx->hw_device_ctx && ffcodec(avctx->codec)->hw_configs) { AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; - for (i = 0;; i++) { - config = &ffcodec(avctx->codec)->hw_configs[i]->public; - if (!config) - break; + for (size_t i = 0; codec->hw_configs[i]; i++) { + config = &codec->hw_configs[i]->public; if (!(config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX)) continue; From patchwork Mon Jul 8 16:14:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5887724vqv; Mon, 8 Jul 2024 09:15:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuklkRoPOUiR6RFx/zazTThRXO9DWWWIU6m3hf71kxExTIhRF/UNEFE5aSCk96HCQeQJUdGh4w4fiRiJ28evWjKjmoc2pii+sE2A== X-Google-Smtp-Source: AGHT+IGK9lhyf5BRWbvzqHBeULYuK6BRmYbmLNN/1DXeJs6EPSTIWqKfqHvhpXWUpsjzkK+Z+3FP X-Received: by 2002:a05:6402:510c:b0:58c:15a5:3e12 with SMTP id 4fb4d7f45d1cf-594bcba84c9mr51681a12.38.1720455302995; Mon, 08 Jul 2024 09:15:02 -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 4fb4d7f45d1cf-594bbe2c901si17170a12.103.2024.07.08.09.15.02; Mon, 08 Jul 2024 09:15:02 -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=foz4+AKD; 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 4603668DC60; Mon, 8 Jul 2024 19:14:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2050.outbound.protection.outlook.com [40.92.48.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B21BE68DB94 for ; Mon, 8 Jul 2024 19:14:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hci7x9w4BlMxKIcjPu29rfiY+K0UyfMiWTntxcL6/AzWqadvCY5q8ly7W0QcIpJi2mgSOcbTKcaWc3psbAVTmxGeJBCV//b9D15kUfIaO6KVwMViJ1Q1q2XWzfp/wy0IlS+r38eBHYOBi3P3l+EKftL+FS/1GFFeGhS5ksHVsS2qlr8pv7+4ioa2gzizllg5BVtv4HWrfw/OL6ekeSTsaXXg0MIt8d4+/gnTBDmhH74skljqvDio12tCHf1OGFJKAAS87dn4iiLdiZYasrqK8JETTBYwWsm0c3UOZRUJzja54i8XKQgjOzrZt2GNeNtzQr9PI6UvqLF33IMYjkWdMg== 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=MvHxiv0XnbI52EbzFx+7xyxc12TWihmpgA8eSDaqSms=; b=foJPSxhWTT9wVwHlfZOu4Ma/p8rLStWA9Zz5HnFrdp87n3oKCIi437Zk82DeZcSIjzpIa8ZPaCr9Z5cGdXq5u/wqqjkzMDaJnzTX/EFifoLN8FJyNeqnDX8ApLTj4dzG6xzO2oKf9Yr9p6CscN5mJQsknGssS5Grifw/UzAzBwKQ2AtRFoCjz2cLlqHGSfcqqL1k6YOhC6Eq5LYkDbZ6A84+WOrc6JW+0H+VTGqZg5ZktHgVJNgP5GjjRpdZsfpRx5VPdrqd5r0uF+C6D77NQB0qmxlPyXSEn2HDapl9C9i9Gsdxqn4IVKs3em4JGOGHHM32O4QJEHb0wJh4+sBlAQ== 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=MvHxiv0XnbI52EbzFx+7xyxc12TWihmpgA8eSDaqSms=; b=foz4+AKDdjr6kFKfE204jUJ94oOyFpFTbVWU7baujqUXlbDGNUb/pNqt49APIASWn5TvfaNNvU9LZwKba+K2aHwCODUynEPceAN6NCYiOgWCpL3RzOHqf9swaddv+MXICRm/X8kNvpihUf1stfDQSK1FWjXv8hqgV3LYvPkPCJ9p/PNe5xtPBd9pwQBm1ZH29SiDHKa9zs4SG02Zfs9wnsZk+PeEYLqXZimIM98L4hODMK7AEhvIu1pYBMwr3Ge9fuigx5d5qtw1x+G5g1VO99lHYSPDvASDnpYjhg5ZE48AykTTnjF6cgF+zgDq1FVIUyIVQjuJvS0if4yZoHS+Gw== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by DB9P250MB0523.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:338::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 16:14:50 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6%7]) with mapi id 15.20.7741.027; Mon, 8 Jul 2024 16:14:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 18:14:42 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [T3jpMGXRiClYkULPM2sJYS+h/ZXfGWsgooJr3lJQiWY=] X-ClientProxiedBy: ZR0P278CA0023.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::10) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240708161442.554226-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|DB9P250MB0523:EE_ X-MS-Office365-Filtering-Correlation-Id: ab951406-73eb-4fc4-2175-08dc9f691819 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: 8Fxk15+jM5X+A2dziOOLlKR5Km48brhCu+Q5LajCPMThSpazWxaQ0IiR9Ic6GcjuhghZPPwnskNDkyfUc8V4DS+Vpz4U8296NGeOULKSBAdI41pVkYvEbiRMTit5f4YBI7BFpT5nSCZDbysfrQbSdHcJK5sfp5OPzjv+v/8FOYevppmaF62QCNJzaoX6F0RzJLzHoBBHybf3pmLTgFPkdTISF5cNzrYNfiY7DU3YIqHbPDlxZ0igw//HVGifBwQzyadHAAD3q4tSFhX88gAKNt1jA66ooVBncnpCejFASu0nvHZzldylFghXY9YR2V7di/1KPfaxQyIrkicHL4r5+22R6tsqzRlyBWQLVqtbSO/Nxs52tmUpDXa31KJPu3/CdfetEl8EXodOi5aYyD3LEfL7c2NoUqdx7AkI6MzGtoSIEyfNdF9VzPQdUifvGZpGkaQJQ2PKjAlx/kCwzWevSTVOts3GILlp81Ls3hNc2ihS6y/XBGN6n8rdCsmNmGx3Iem5KgeGEDceC+IURGAB0DesC0p6MC6keWDsqmFI28wYPEnCPM2I585gaGbu8/YHp6nuMZadVCnONpMrOIiSm9lzhaLbd11NS2qCB9tq1rUW1K/93QGnzl0/57coJN48xHKNKCClJaK38FjnGf11L8j75V/VwQsAUNtAYB4DyHqUb88pdps2QA7dC+UpOAsr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9GAwdflH37UQ8hBCXLeBuBekVMzj+3I3loZgoVoTKLbL/MzPJB6Orc730MM4tEyNUm/hhsa4aqqMtbiF7ir80NEmer/Prt8EWZzzQxHzmUNUo6/CfxQcYUk3GmAK2nL0vXylK5kHvJQW4s8PmK0blyC/gyVF4cQGCqYey1crJ8Zbg+Ino9NEBpDrp0l02fzRMwlTV7rY8Pvfbg9TdhB1SG8ezqt65GsNj7tvm/SkzkYZm3h3x3TQvRMz0Tseu2qjCL7MhgkEGxNvg57cpiUj7InsytSCPoek1Ushc9wVHV/PLT3jmbgeV6M6Dq4F0PtgDkdSVQwToSaQg+Tz+3sEjKiZha3GQhzbCKoSOyrSlGO0S5sgB8zZ4HcAUH4Z0Op9R68Sa2xIuu3d+LLBSolEywpjSIPsfITJDlakEaRm15pjJR0D34KfGfNOi9f4AVupFyJEK5zb62cGnwfjyZ1IVbG6mlo3esronnfQxZqtBVJD0NsVrAi8gDQGv/6S1v5PpOk/cONFydv97ToSWZN8r6ORAhkkLv8fgAUz+6fYlbl5ck/BQNWN/28l9eJnkJUdOVwjw9TvbMhwLERl0hhhp2LIbhca6CIAH+k3sD+rHKjVKywQCmzEz50yWXH2Nuj3Uf9N9Ig+Hfz+mtqmMwftZbK+hmqE0CQEbAyHTcjhm288prgVekbo1s7Ezp7wkGH/S3bGJLKYvDJvg09BIocvPOio5w/82OX/0SQ6mHq8cLLoLFI008SROd+elfTlTUeMLERKqguVWfFS8XNLyI+5o71/y179e+DOWOha5FibQDfO1dK07ILQfLabCvyds8SfNGijgXb5NHeWgKMEu7rQyA8/tUitlBvXPffwRs3ByWxhLlZhjV0Y06iPUUVzvWvmNajvvovpMOG0D6MRlKC5xQfwytjJ/3cBm8xUXWUb5bcjGmSHsLDxeHD5jQrAVWoFUFvePMEiEEOcbEnYEoIda4ywKVxYXxWL7mzRMiH+QXupE50m0GuHCwJdn6ktVG7NdnVJp8SSOqT7D7fqmLs8wzgufmyuGClPdt7xJYqcs9YCl05Jw3ir/hY6je5TlEPem+pJEGz/lwHiPH24akMXUZ20QrqKN6FApBFZTqu3ac/yx/EjoFNIdq5vZmn1h5Yp+4m0lmyoEcaH/AKtLQcEnKcg5HTJvGpWDmTulQK8GOgY3tN6fecfgJX6J5mIi7OZjMG9QL6fw34m26qn+CyxNNbjOlPEUll0z3aCdNEJjj9CqZosXFgvkhPgyG3yEcXxKH9VQQojrt1TGaROwxxa8Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab951406-73eb-4fc4-2175-08dc9f691819 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 16:14:50.7200 (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: DB9P250MB0523 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/decode: Avoid ffcodec() 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: UJPeYwkbBhel Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index cdb682cf69..187b5b6c85 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1029,7 +1029,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *avctx, // If a device was supplied when the codec was opened, assume that the // user wants to use it. - if (avctx->hw_device_ctx && ffcodec(avctx->codec)->hw_configs) { + if (avctx->hw_device_ctx && codec->hw_configs) { AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; for (size_t i = 0; codec->hw_configs[i]; i++) {