From patchwork Mon Sep 11 16:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43701 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2259024pzb; Mon, 11 Sep 2023 09:46:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhSpVcl9Qydg3P+mBL6XlBRKa4JqVieNotHhwQpOXzQxr4cEeG0g1pcsCx5QWlLLaXld0s X-Received: by 2002:ac2:5bd1:0:b0:4fd:faf0:6591 with SMTP id u17-20020ac25bd1000000b004fdfaf06591mr7484382lfn.10.1694450763643; Mon, 11 Sep 2023 09:46:03 -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 k2-20020a17090646c200b0096fe1a56de3si7090649ejs.1048.2023.09.11.09.45.59; Mon, 11 Sep 2023 09:46:03 -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=WBiMjm7s; 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 909A968C94D; Mon, 11 Sep 2023 19:45:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD63268C8E4 for ; Mon, 11 Sep 2023 19:45:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ah+XwIdhd7eF/2uSy1UQgzXVmYvE07f79UAOo4uP5Mi2dhHITA5vkDQHwmWoy9N/sLrRbsn4gpALjbrJ6r6M92b11Hq3wgZX7ekjXYkEr5rX5yQ+dxj/jER6BFGEPxi4txP0O44nsPuvF4kNsG7XlIsM66VSoDhVNWE7w7OsTk7tjGYu2DkjdMrH0LuKqX677o7Y/aSSLxEA9yBKwd1NfTsII3ter7PWx95RJh857xc0swgJUjtR26GSnROH8C8Vsl0ZnHIStoEVBV56A/AGqL0apDT8H2guf8bxgx7hoIflZ/BVYCHzb8wqN2PGZzAjWfS37yO67Wnu9sdSCn2MLA== 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=Wa2kcwnhy0LO5736pAWvdRjX3bUkdQdv6te5Q+zl1vk=; b=OtzlNBXOVf1rQSZHXCEQCwK/CCc5zYJJKggRKFuynadVCoU+VO85nBf/mKuwDX9KaB2D1l21S4rGJzByleR7rYJpBtHilkOm3f6O+ChBmv9UOI+IKs+9YqjkqOSGHRj4YD2EL/u4IF5yf1PZiE9hPPd/0PD4g3JbLoxnLLKnBAe3enbJ2kCSLI73VRBdo5MLg4tEp9SL1JoFXR7HxuqMe79ZxxrVAtkdGM+imNZ28ynkZVbVFOCk+dgvioUyLAg6/964TxAkasi8dz4nYNUwUis5P2G69BE6l2TeSQrrJpCMGswbmdvZszWuIkh3Pz3W43XrUErWCUbQ9+WiGz1pUA== 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=Wa2kcwnhy0LO5736pAWvdRjX3bUkdQdv6te5Q+zl1vk=; b=WBiMjm7sA15BCpuOCrXyxoJn/DV4yIHmqE/AldQghpFk4PqNSFyj6+ku0YgR3Ml9LD2LV3Zth367Q3HrHBnLuP1XUiQiZuYn0VpWW7PRaR2OfMhXQqAAsbdmOdV2Laam8FBpSibRURVeU6Vb5RnpD//MuaMOVj79V42vBMbQP4UVsZjrvJcKQSVHlZYd1MhmshaKd2nUOlhn9KkfvRgsFN8shZJJ6TnJT6X39oE/1sUnNPU45K8z7dW3yDj8h8imHFKEdctFrfjajX1aOrMx0PLOTT/ETmt29N240KCgkl9C9GLo75giig3j4Ur/zqqfz985YOsSEoS+3CPoIusRtg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0147.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:274::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Mon, 11 Sep 2023 16:45:48 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 16:45:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 18:47:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [nJSVAJov/J1kgeMNowPDZzwNItC/EiL9] X-ClientProxiedBy: FR3P281CA0203.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911164700.449006-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0147:EE_ X-MS-Office365-Filtering-Correlation-Id: b9d568e0-257f-467a-9070-08dbb2e68cc1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 32FuWzLBByMea0hiVpXQ2Z20Wz0tHyDqO5rdE7QQQjEaRskt5OlIS0LIHB+Ogo4PjlifXcLrel2pJgyc0X+bvAJQmcwizugrUAYS6/yI4HsGojkxCPqhf80g6lu7r9f6zF3ObO3WTOz3BWMxbuvzR7SnrMCoajbG7vjCjfljhGSnR0nEapP7GtdvVko1bPC/HqtjMmjFfZCiw+ZXhksEl2m+2t+2femuW3VrYFMBdYxx2l5/WPca8w3QS+9pvt7FMhGIjfn2VyFRycVcMzd+/df6VxIgu2Nalkgi8mrfqsno1T5HyC1gOk9N6GMXjxR32iarGhphXXWlDrTwQcpgXkGgSD66/babQmkzhEEJpVMdDj4BHWEvkyweEx7zAJwlL2IzOnj79JSClvGW9cXYE3XO1UqVs649c3q5yO3B7YtiWg2bXTpceUzzvMATh5+9+V3+MnSlHXD9g6k9kdQ47apwa0dnzZjBILWS4aWQfqAiXlbuQ5MWAvEHgJcJ5i5PMN3nLthtyiEp0vulhVil/Xv5dUX2PS7lVM3NGVtr1Dejm2LMXYUzw/TNQLDkAjhwogTJxvBS/1+KDPh2BvOwcH20B4PvvM+LiAzFxoSKZIfQ+26VJ49vhJ5Yw/X3VtXr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lzjEmzkVOFu+Wt80hnLAdux4vUNcBckUetZym3aJNuWRuEmrsEnRKQeQ4X0fI7mmCwErskspyp0mfDhZ3usW+rREE0cO1t5ii3ok0zVknb33nEQOC9vVzOgpK9cwgnGbZcgLuPRM5sl+J2vL2G1vugrwrvlc1AbSsP+uSgKnfspqdkIFFirzB8Z00EY6hg6WAVVAjpl8QORshuZETglokfdAYhkHSno7O8Jm74wkpb4QvdBcFvOlhI22dNM7rYBuHe1TJEIK1hxY1xAw3TE7dqP+2e0UMyFIZhHpuTgVbMVfgMeApwaeFkNCAOlYwd2SSQAs4GQy9SXE2iN9ZKeYlRTNrSFOogBr09g/9oukx2i5FNd1OtbZj++apfOz8ZsliQo+1q84bjDaxD0LvJZ8a1v3fPnwX7YKVOaO6OcvOiX2NO+6azwzYMZJ9MYlL2drWIFNR6SY+nfkpZQrZqVg02CQuI7SP2iPn8gHYdE4gCvnpGS9XGJ7REtNh3VFigYLt73WbXnSssmYhqabsjTx+3aTzgu3WfZTv7hhkY1aVhnov/kpGm+xMzQ+jfMvL4f4FGKNmXfayPJarZNBlbsONHjk9EPNmBjnDOaVA5+MqlrrTAw+xgDz1gZR1LmKasP+FWVXk3mYGYfepsV3guUjXtA38PGpZwHT6Aq4hvuW1LddIJ1fiBGUrYrOQg1Pu9Eo9ArvxkLsrhxINXuKoD9tPBJJiwz4kbAr20+AyvELCDvNZL+Faj8Qh1WcNSAT+hjKF3B6vu4DLaRNmG4pa9nPHLnpAEvA/FfNMxuqdnFZ8qhahxw7XYIO617UzQGB1mXlIywla6ikHePgm4UjWIrzQ61fi2sByyH85IgXlWh5QcH1uSslts4v86ijo1vQvzazPXQk4GxTMManB+snKQ7mj3+67okfU8E7nEOsb7JYr/+r8AVyBEmCz26bhragvs4/IUjVJ1m33sOKgsoIQ7Z42wWe0fhPteR2EXl2o8cLG5epR70KsO27X2p8dwS6fuvc/ERJggT2B5IhTaZkONlQhM+x+gtSSlf5b62Z7to5ntaZivStiDcLMqTSRlSYZGKfYSTrBgD2P0hkwR+8B1AtMBsQsPT4WOVzNNHx5jtozN/UxNSUGOuQ1L1zMdHZzscqKUNXrz7iFVcxCgIdcmi9A9tx4q24MAnpQ4lmpczfXpI4/cKcLSXZlNN1MtasrFjbSCEWvLS2gU1QU83hiNfyvd+IremsfJN9OkF7Zd8H2A52511F3DoFKM7L4ZDxcYZ4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9d568e0-257f-467a-9070-08dbb2e68cc1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 16:45:47.9607 (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: DU2P250MB0147 Subject: [FFmpeg-devel] [PATCH] avformat/aviobuf: Fix function pointer equality 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: TmMH5VzFOx1F Broken in e8704a8f60041abb84585efaf3223abf0b6dcb90 when ffurl_read() has been turned into a static inline function different from the actually used function ffurl_read2(). Fixes ticket #10562. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index c55fe8a837..2899c75521 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1030,7 +1030,7 @@ URLContext* ffio_geturlcontext(AVIOContext *s) if (!s) return NULL; - if (s->opaque && s->read_packet == (int (*)(void *, uint8_t *, int))ffurl_read) + if (s->opaque && s->read_packet == ffurl_read2) return s->opaque; else return NULL;