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 275E8471E2 for ; Thu, 28 Sep 2023 21:35:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6446A68CBCE; Fri, 29 Sep 2023 00:35:20 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2011.outbound.protection.outlook.com [40.92.66.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23D9268CBC5 for ; Fri, 29 Sep 2023 00:35:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iWvy3GlP2Ngvo1hEAhLd9JwN+Xu4VcW9DHMoBwujsC9yYGP424HcqMo85Q87U9VfeJ9LhHFdk461NiX9UDhm9pOei84RI/cA0mRnb8RQjmRgjDCjgJKmGxhzME4GEmiyYIxxvtqt6/1wvzMiROjIj3x5EBaZLBTksLdQ8CJvxIXuJzo20xwUsSUoYvt1jIej8K0yT+Hy278bIbUKomdODG832gpuEO8Mzn7MygmYF2KfRq9uilu7p/GGqZfj9TqHnRfBxX3YZehzeCT4WpvrDKKqFmlXNl0jKpPK6a36l3cxFffNhU0xLawPFCu2wkq+RezlKoQktKJeLLjBSrjMcw== 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=+p1VQH5pCvgxWTuL/oYOWungyPWKLR78htq37mi7dOU=; b=L2rUfZ762cXRUa/z8FvoYMnt6RyRgWF0pccRqMxz8OlTl0NY/k/kkQ1Hd9JTipVspJT6hwDL0IcboCgnKlx03u03RXXQhkvOL/icWgVxBVC5Cl2Bi0Gj97LkLbgU7xAXO5oECtp30vByH6mcORrdn9ffZ+zLjN5XQCIFGY3iSfXDQXdvBLasNbHyfsLzMfZB1DfZLNhPoPa+9KjoFA83PzP6Is1zkcDUZsvVJAAOSQin2pN0uZMf+fbeew9Uas2djj/NYQvPqgXiMdrNYVL7ZScUSUyo3DTR83SVTtSElIQuE7UUnsxydbl+7vbKjjoUNKe5VHy50rcS09jiuv0qbg== 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=+p1VQH5pCvgxWTuL/oYOWungyPWKLR78htq37mi7dOU=; b=aAFMiIlzevuCvJZcyqJJWtpR2TjJlTWj8ifCJSdtDZSlWdTKF5earqI/W/uumerOPJ/lMK1rUQgoUc7Ede2E8QvS/JYD/ujHceLSP6UOY/exJZPHjUnKxOtkv+0yc4hcU67oRU2P3KgGNxx2ve9bB6i7v8EWzMkW6t8nxLd0aU6w2jMIeHUdkZt8Osy+mbclya5nMiw0Spu0DBewyaNGuyIjOGdr2WnOH1NJPUNDlgFyT3z+zWxGU7TiC+CtjCUIlo7os8+Ur9DHRzXW45In8Ri6d/ReNPma8mrQxRi1EO7OPOCI3Okm7iYfYTNplZ1jfF6Y0nq4xCvhyrmgxgbKMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:16 +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.6792.026; Thu, 28 Sep 2023 21:35:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [n6kalOKJSRcgpUJaEfJWrwapNNPk3pLz] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ebdacc8-dd6c-442a-7e88-08dbc06ace1f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8nFgGntlIX8rl0YVly+Bk2yaZhwD3vEvrS+s1h1o5XtSUyrdBjsDt9+poWHhEXowOx9608BSPQ+JBooZB5jjkeNbzbxepnYuWBnCda34BFjx2rHek+7cjqNl8fzbnAfV9aNtu8tvUQIyPOmAtI/bX9DRykZWxknSFJqfngeRwpOs7s7vuBOECLtC7fHtAxqYl2xRUca5jiws8Zq3KjppWMue9IJhikwPdkY/2QdhlhvqZXUecGOq6szhPJ9nfmiAInA3WuMRF+mW705yfmeBuG4oQAmxo4xuTANa5z0jwN6O9+Y15JAi/Mgki6EdJvgI4tp8azh8/oACUVhmqbzgvysaHuwQF59MhwZn3RVBXCHAJOKrfVmrnvh7Phn9w1VYXht8ZtcDjiN+C8STD+kuv4gOlk8iRJtxaywdfUb4YzOC0gQbiY8CnKV0lnTxHsTcB8OHpig3nNYI4iWdelbfvtor3/nW/dm5WkhBo5e/J2nES5ZY2yo4rVyxi9OrpnkIpgS+ofnzdtdCTH18OV7TlrFQ01uWDahrgbzujqGyc28hjNhqcOwB8NtSIG1iUOiQvB2WtmW3R+s5u0tY1lbDvQVR1itsSGBMfJIynI3bJSHS0lRjn47PK8dFDKySlN+7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MlxIq+OcggN9e6xq4LjzpTMb4YroT+o3DYCiVeRmJXbOzdGU0wlqHQaas93I?= =?us-ascii?Q?FlZnbsAH0wzNOkLBPZ+JKely3xGraQx6qvRrIwh1tI5qKSxbIw5rTOkM+yVC?= =?us-ascii?Q?g8cTlb5IrcrhM8hKsDvOODdJcC+EuCBOHXcj8eVyB4XLi0va6jGGo8n8buQ4?= =?us-ascii?Q?pS5OoA0rQhNSsw81NGz3sWwC+uwVvbqWu9pORadnagS3xbrvOUgI4fKUrWeU?= =?us-ascii?Q?MLhoIeaB9r2EjEcc73eZtLROFte1427ksPAcVnmucKSas7SJC8iH8ROqjOse?= =?us-ascii?Q?0TrRf5Kv/LdfRU0VOPaHOstlL7ACdUaxew4+bo+2h3R1jw1VzJMqABAsfxMH?= =?us-ascii?Q?Vv4lzt7k87/QHZqsaZK8bkVfQBQuvTd1qa2sHlPuzSONuM4ibrWoE0P8EKNE?= =?us-ascii?Q?IzA4cMk5H9JT+3ByccxZU/YoubaagG5TRiW0FzkbMit8nN69WE6zK+VgJd/x?= =?us-ascii?Q?TtKGQxTuoHHeCq9vSVrNpRWCRG9wjlEstlFFLD2CB5ZUuLtvIufJTJuEVOm/?= =?us-ascii?Q?nJ9jtvkk1Eth/ooXH60PQexcPkxAJKObBOIDr2gM32DLMcALikEztQ3ujqRM?= =?us-ascii?Q?aVkJwpi5zI4RJFW0d9KyM/1ZsLYU6d5v+kxzQxUu1mfewysVhaCYvlCUcoWi?= =?us-ascii?Q?Igm+RrJ7WOnQDyhu9myTRVQjdK9tlwjxtVry3L+TYn+j6o4oGWN3aNPlrWQZ?= =?us-ascii?Q?ewRZXSeFi1nx1VSg+lSwfRjMnYeCdzj9QxhNDLLBlT4gECfMJFok2d2MLaNA?= =?us-ascii?Q?BRP2yeliL5oOGbDZitjczlaJNP/oK7u8OWyL2r4AnXYI9ZHJUTG01eJch4AR?= =?us-ascii?Q?3+m1F5jarQuUIALUc+Kkct2OwrgtUH85eGwazOpPKNoBVL5bXRI2bhgkT+MF?= =?us-ascii?Q?e+1ImXc82qZz7fvTl/XXrfDa9xwYhWx8jvnAoEsexJruDdZVnIdoPU3VqgEB?= =?us-ascii?Q?z0MLCW6NtKBG8xBGEb044SliteDBvtJGza11f8SHtVBPR3CItmoqZ3cBtgpo?= =?us-ascii?Q?ETIz2NrstK9jgGs5P4EDgoFHa8sM7rFErXXAtSVNcnTHGVH3ZAZHRbJ0w7rz?= =?us-ascii?Q?kB0Qcq1IyEXNuUmNgDPw4Cu1oJK5WOnZ2BteSkWQvCTijlf8OQ98ylx4bNNM?= =?us-ascii?Q?oBsdbkp3M3Y/CyFT9WbepBmy70RmhnLyWgRc6QczcKsBVFC9dl7AilCOyI69?= =?us-ascii?Q?tKbWztSPLtFo09pirYBE958sIS6wiFDVKt832SnuT/gLAw+1bLAeons5yva4?= =?us-ascii?Q?Er4rdA+75x2GidmDddK5?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ebdacc8-dd6c-442a-7e88-08dbc06ace1f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:16.2710 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 07/14] avcodec/vorbis: Use void* logctx instead of AVCodecContext* 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbis.c | 8 +++++--- libavcodec/vorbis.h | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index d0b660b44a..3d85997576 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -27,8 +27,10 @@ */ #include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/macros.h" -#include "avcodec.h" #include "vorbis.h" #include "vorbis_data.h" @@ -104,7 +106,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) return 0; } -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values) { int i; @@ -130,7 +132,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, int j; for (j = i + 1; j < values; j++) { if (list[i].x == list[j].x) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Duplicate value found in floor 1 X coordinates\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index aa1ec5719d..7190465f0d 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -23,8 +23,6 @@ #include -#include "avcodec.h" - typedef struct vorbis_floor1_entry { uint16_t x; uint16_t sort; @@ -32,7 +30,7 @@ typedef struct vorbis_floor1_entry { uint16_t high; } vorbis_floor1_entry; -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values); unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); -- 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".