From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3BDE948204 for ; Mon, 12 Feb 2024 00:02:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83DAF68D145; Mon, 12 Feb 2024 02:02:42 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2059.outbound.protection.outlook.com [40.92.59.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D19B368D130 for ; Mon, 12 Feb 2024 02:02:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=coHBpeRKJmbezeort152ICcxHYrBgFuH2iVaDCS0nbbXwtk3PesXZgAe7QH3QLAOo7803OWcVm6ulk+QgVE3aaaNYIw0QNyr8FWIS29VBaI/t/u6WG66QCM+d00/tHJegSXxn/vwOIQeLebqxoKpVb6qBQEgGHjO2CEaW818tv33JZOAVyhaprVgRLNK7vXIM2Sg0rky5LIo5wZZ9pF3EsQ3di6wCuRWwiRhX9RraSDygHM0UyLH1FvOC+emSTuFKiO13uO/nDcM8eOHeRBLWVmKBXR5Xbz1Hhl6xP5F2MukMOB2KCGXC5GNMjzdvsaClAC6+9Zt/jOjaijDQI+XmQ== 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=Jh7+2wd8ZDs5dZx3wUe7LS2S0jvsjAvorhgJUZ2ANac=; b=jQ3/7YmZEa5SOTssriFjpW+Pznq8g0NpwSqcgigGS+X83bYR5wSKt7L660NP9XhPjMIHO+egutdj8x/Ka+tvm7yCZ0FgXbS/p+b1Z6GSOso2Huu/aveWwI1j7r0ifk3a1u2Dx3xCZuwUkTF8YOmMTkMazcqle6vOfnMb9moLOZGb98yEfrXIr+c4Uf3I6nJZiJzMFJdqM48ANLJbdns32Dre5HOsIzJEWhOcSOLZynVXoUvnz5GKCZfegb4wu2pT4JsvgMM4qzN6XATjWEXyj9WMb0/gcD9KUO5t8Hrj7wnk7eM1cFub0z5iXtWsyUrJzIoTZc9oAlLGnyh04PpSsw== 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=Jh7+2wd8ZDs5dZx3wUe7LS2S0jvsjAvorhgJUZ2ANac=; b=ZGlPQ5XhLXVvESrbUxDoTGBPlcUkACURLLebM5irrbIClFxzZF/PGS9h/BePjRY2k1+JdLIEFc3oPQjLnsp1PmK7bapkMPTMpgeMCzn46KJjeylggEuLQVgVx5lwieuFNm0x/wOL0aMLeRIaBdrBYFAGfybD1QZqeWqo1L4udB7ozjWs2dfSmVHkOHMQ4GQ3AETsDKwpaQJu9mSL/yNM3B1dh6AxTVa4h0naQAmYOgjobVlHAgOZU6lYePTKdmo/rjc9sVlOPIeq2U63bMBkWe0n4zova/JPKzkq6/+P6Y0unH82Zj6uEwlTewyJN00AGHA73EFy4d+iyDXfnbXCxg== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 00:02:34 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 00:02:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:21 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JXEIiIZl51WRbK1fZoj2YPfzODBBX/muG9e3dpx5+9s=] X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240212000335.27984-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a615317-684d-4461-ac27-08dc2b5dea5c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZkxqMYEXwih1EpybtniBlX4mT9oezuAz3boa/4plBQXmmZyqnxLHzpvt88hSfVFd1ojmqelRJBlUdauiGmbHrzBksqITm3OBlHg0EmlMY/Glh72p4GqtxUyQOunWxcWyq/mzCHtcRgiwEjTkITErxvot6CsAhrNfKkCRPO6gTTKUgHEV7OTfqxqb+W2yhv4ld/GGBBR3Yzhp7R9jLniegOaN8ekVvuvjSFUsKUQPdupJS0540tdCWFMetJNjz90O6Szzf6nWMVQxE5yZmBOlOInOf58//ektwiJaWEmcjIGW11WcJ+l0rbYViM5Dlxswaid2EMbwL7R6L33/g+cY3O1IBnZfRq1JJ9QYuh3B3Mc8e6vyMrYnVA7aZIUhDa6UdOJhSDMryLPos3WxsDd/8jjlNeF2Ig6XaK3GODlItYXumRRVr87nFvueUJqaWMj8E6Zk2x0582q8B3OK0ctjnQs1hVjDA//wNIVKt6mHr9lnJgClK94Mippjbq7N+FWmNU6f3dRk8VIAgExmte8RYOEIoK5+Gu4mNSIDETAMv3J4MWP1VHWZqCLQ3wEVUFIyXklOc1bSik/qtz2PNMEjHLBfpBAG3G5HYFElGQplHv4ZEg1qI4WQhH5edydT+jn4O2nym6n/Yp5VF01l7jHS+Z1Hc+CKA6N60W5yN3u7vLlDou+m/0mGt+UXMT8D30ucX114oYt6wmw1R6TM1lUYyhMEjC/BcoXjTK0Jrtz2N4p8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZE17XCbrKkBBv9lpnKJL+izi2aV866HvXNC6qvQNKZr8Z7lwwYrSj39JEP9dZ3KniLlmzvai2IHShnKyXyao4LfJ6LqCkLEL3C5rF5dV05Sx7DinC2ulBzqSTu7Cl6mWvI5ShNw2SrF8u2Fq6ZCJ3a3RgV8PFiTk/5/ldVgiwPl2Ez/fpOGQ6aMSjPc9gJVf9J/cW6Cy7TKGL5WnyQyIgMEMXlTbGLuZIirJVxQ7KhUxVrr0DRCj3fybHMnU5nrtxaVqSnsMSSLfSyTzp9hk2jKyGHQdcfCUT7XlfrmgpBEAAqDaU8zEwmiNX7yuUcaHoEQuaH3TVpWmOPe6nCBbdnSIGMt75n0hI5EKLctrC0t5oWsHWSzO+rXrehcapILDbpb/I86PrByqZKbD2bdWnC6DnbVac2g4JBbcm1sZXK38nptQpL//VP8OWuqwGTn2L/lOi9DfeI9eZcuC3vj0Aw3B8CFx+wZzeoFQAnjCrTufxiEqGKSUmY/G3NGYoiDMiFVIFpsZWEuvFh2sQ/oqa/Ykp703dQJ6DqdDCNxsPYid4TyzJX9HmqGMqdwj0VQU69CaPxXIb/OvUaOYRoLK/NNzfxsKN2iPFu2p45OukWMa7eDzL3WvVOcrgGtd8bMf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bonbdQY9MC00886A+2f+GvCDa+RoCFPls2FOZupEOgWpNNwtohVF8xU/LlwP?= =?us-ascii?Q?OB1uAPi1ZOk7UweHt/W7NptgwNQrgOFOkcqAQBI0yrmJ4+jNyiHcxuiu/kGo?= =?us-ascii?Q?JwvrgvK/B2I9Oi/qpsrL6KRxAjfJHrzrC4ZdUF+YL/qE46xB9zjU5emzRxvH?= =?us-ascii?Q?yFExQtG9HC7CuM+o9gMhYl1Dv8ng6Nn0CHmwlNn5KSeobNhntrCSMR7xIyJ9?= =?us-ascii?Q?+SS5UzCoEo3Qly8h8Xd3YBg/Etu5TO2aq/9HfbzUgk0H6B8nWvMZVrFkXPwP?= =?us-ascii?Q?6UqNa0q7um5hQGOSaO+oVDkpx1IDO0M9nNfK5/d768GVj68FPQJqCAw6H1/M?= =?us-ascii?Q?hH5Qb4jYlyY45E0bdUZ8D4SGOrtr0ci9rqi1q361bB0nqRThjcsoyaC554Zl?= =?us-ascii?Q?KQoyfHUDnBITx8FI7zZOUbZHOHX1uzXKlRD/4n5NulUf2TcBi/Xczba0WVvx?= =?us-ascii?Q?mklxTlTz67TBpaxix1WwIJ/n4cexJKWg6kuN6UzQnmB5urO+toEqmQ2Rs8nT?= =?us-ascii?Q?tIBEDyXpzIn6hjfLeKH/R/GoS4MAdG+8R/s6bbPgv8avl7HzkTcVmhl8b8Lq?= =?us-ascii?Q?C88dowAMQwmiKYAeLVMwioii0jPTjC0JOkCfNmZ1LTXKn4ltMs8qVK1VaaTH?= =?us-ascii?Q?hE8TAGzgGIRSBVIkq5L2kOICtgwFmp9ckxZkATFjW3RiA9cotH53vTffbgEz?= =?us-ascii?Q?L4o1QdIKI/2+o89VaUOdRLMAJhdp7x7OMYO+fT7HMqPBoj5isrJz8qhkCiOM?= =?us-ascii?Q?2RSlhP5adNPg9duG4HS6K4K81rGAAdCw1uA54bV2kvI4/rvL2ZUmVvBOtxtM?= =?us-ascii?Q?YzeU55QtDJ8vC89viox3haVVJWojvupK+j77m4Q7THWVEt6t5TmNBNSkSOWy?= =?us-ascii?Q?hc+pfsTb8LHPb/PxYAt0i6PDja4RxEYXNSh5DsLHSFgppCn/W0GyJlN+EPMK?= =?us-ascii?Q?eidWCopN/leeveg6E7Slf7USwk/0fYoN2Kc+4rsaqfKbOxkyfxnDO2dIFLMb?= =?us-ascii?Q?enHCGX8X5KgpBkD/9K3yGty7yzueYWlvQRdIXUUsmUJxWuDE34np6jQ57+96?= =?us-ascii?Q?NrgnuO7FgwXkdYaWDi31iC9DbtPO18JWKovIe8W22edLKg36rbsUtO2EdcDh?= =?us-ascii?Q?WamFTWZLHG9imaOcFMYL/tEvebi6KgSlkIL9EeGEacb/kBv6W9YevzjqKxLQ?= =?us-ascii?Q?/wQlJp6OJYoV4CWQmdwbpbwsFK7hltJqglbNxlwlnPhi4lbqcHBogqUtyTzy?= =?us-ascii?Q?PqBWKTz0+dMrIpazWpvj788yAfT9DjgVgBNqhSCNEg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a615317-684d-4461-ac27-08dc2b5dea5c X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 00:02:34.5919 (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: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 09/23] avutil/hwcontext: Remove unused AVHWDeviceInternal.priv 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is no longer used by any hwcontext, as they all allocate their private data together with their public data and access it via AVHWDeviceContext.hwctx. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext.c | 9 --------- libavutil/hwcontext_internal.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 63fc1a6a22..02e9668c31 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -139,7 +139,6 @@ static void hwdevice_ctx_free(void *opaque, uint8_t *data) av_buffer_unref(&ctx->internal->source_device); av_freep(&ctx->hwctx); - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx); } @@ -168,12 +167,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) if (!ctx->internal) goto fail; - if (hw_type->device_priv_size) { - ctx->internal->priv = av_mallocz(hw_type->device_priv_size); - if (!ctx->internal->priv) - goto fail; - } - if (hw_type->device_hwctx_size) { ctx->hwctx = av_mallocz(hw_type->device_hwctx_size); if (!ctx->hwctx) @@ -194,8 +187,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) return buf; fail: - if (ctx->internal) - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx->hwctx); av_freep(&ctx); diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index 4df516ee6a..374c6dde2f 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -41,11 +41,6 @@ typedef struct HWContextType { * i.e. AVHWDeviceContext.hwctx */ size_t device_hwctx_size; - /** - * size of the private data, i.e. - * AVHWDeviceInternal.priv - */ - size_t device_priv_size; /** * Size of the hardware-specific device configuration. @@ -102,7 +97,6 @@ typedef struct HWContextType { struct AVHWDeviceInternal { const HWContextType *hw_type; - void *priv; /** * For a derived device, a reference to the original device -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".