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 9447647A99 for ; Sat, 30 Sep 2023 10:27:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1916368CD03; Sat, 30 Sep 2023 13:27:55 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2107.outbound.protection.outlook.com [40.92.74.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC99268CC9F for ; Sat, 30 Sep 2023 13:27:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ml5WM7XBL0nb80dz81lXv3j+571AZmURiJD/Le8e2pP9xo41fZVtGAG1nKJJep3OsmvhSS0oYg62Rbya5uOSOXUXAaiWtHOy3F8B74f3fI0t84Ki5NvSVFoOFK7txhUxSrPChSQ1namOJqT6hShV+ThcBq0HNvXzteFpEVUCtPQSn4EDeR14vwooumh4XamU47BvJvIkBbInRuikUCFQsFhd42hZweQefDYgNWdatjuvEW5vUYqQF/FgTKWXGhoDmDsN3nEoVNaMiknu1Yc03hDAWHEJGptKSwGiig/xEJuSWvIK1q9rOi0sk/ltZBWBwA2mEaFnnmEE+pRHDnVf/w== 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=M5p6gxHRyTiMdOBg7aNvZBfp7EYMOgpf8DWhOL2XSyQ=; b=AguHDq/kba1iG5vnOlJDSzOGnMcgI0EruHMlDBabhqUM9uIXieA8XjltlkYtRjUThElmr1jdQoEeydIjbOI4atmWm3JX3lSWEg76c7tbt+zkRP8zAq3fLcgD2o/05+auSOn+vOZOlU1kipgLQenjOXsFMQ9MwC4YolGQ4zs6o1vy6pF6wgM5yhpKId/2Serqw2nnrDwTaGoBwlqwr1NLK/KxUu5XRWSQ7R9YQtPIBdlo/BBvEchgSwPzw6SIvKG2C0+AitSmNYUmb1+FsDZohkeAXKO/x/t307vJjMXx0SeWiKmh+4n0cldXkQj+Ozz9JpVJS44mJtOf5BJ2hyVHAQ== 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=M5p6gxHRyTiMdOBg7aNvZBfp7EYMOgpf8DWhOL2XSyQ=; b=YDssoU16ZZ0mn0f6ZUt53LRel/m7zIecCFhJO6oV2r249KK9Nx4BV28pICTB5CYHg0PD1sSbE87FdnP2AEmc98mNSCrj1pmFUB9PQkhKng0lBjgmEal5R073qrzsLvxrhksMyMaDbWoaQoZByfHVhb4WxuXk5HPsmgEL/+seu7UCQ3mktJeUS4VBPTBBH5cXtYXCyp4MlpsEbA+4z/tmQH+pH5rHpZv5q1/9azCN03uy+3kvMCKikXIfl/uYtlpdsLvq9PiNCGw1K52HfyXv9JPxjSHRIq5d17ZbIjXcVH+lzjyHbOKS7Uv3p841DKce9za5O9RSAUK6ynUVQ0NtfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0424.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:287::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Sat, 30 Sep 2023 10:27:45 +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; Sat, 30 Sep 2023 10:27:44 +0000 Message-ID: Date: Sat, 30 Sep 2023 12:28:59 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [+UcGL3yZAR7w7z8F6hWuU0Fzww6vID0D] X-ClientProxiedBy: ZR2P278CA0059.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <95188154-91c0-45aa-9cb2-373781e9c7e6@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0424:EE_ X-MS-Office365-Filtering-Correlation-Id: 357a8b81-b04d-4cd6-a73b-08dbc19fe24e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GU5YORti7L3qyTAlcDupuIuRvV5oUwgcaRXi4u5Muk6EVj7UQQYI9Kf6tZXHUDCR3uMbMbVq4+hLtlRAa2wjd8jeTRHErG9m8kJVHOFaVm1sRxS+KKF3wOEBImgR5Ueml/0rwKbGB5Lw1gEOfnJGpL3SnA9/Bhy5j/pu5Md33DuHq6Z5QATYvtEWDVTPH2E/bSwNEcbiQRrn4/bVTLFIQNPJm+wEXHqlEm1qUo8pCZnt63/OJgLmI09KsoAcFh4dia1Oxa114iupcvY1Bn/HO/FrGPjwsjVCOyMAfy6VdK3P/7k0jjYwU25oPra3syPWuZTTNKrpv28utpuhZjZs0qo8Z9rzoN1HEmCvPJ/ly/xe2Woe7zYOgPK5Uw1NAI+4iwYv444228HlOLGLO4NzM/5zhGynjJXNZCilwftPY6Kt/uE4OvD3xqi4MNqosDHwDauzAEQ1IcH4CWLeGkPvnSRKJpOcTTQj0yp5uaylCeP7mnm9et4aJJd/yWlvIGzPF9E1EjGL6PtoVU7+cugzbbd4m9wQgIE4yN+hif0Hv20l/hu/8oXbPxKTg7Iyots4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZG56MGRIeVJJM3h1NnJkeG9LOFRxNVplb2pNYnJsM3lPcWR0TTVRVkpLdTd4?= =?utf-8?B?dnF5T2luOU54cU85TWFUTU5yWjZHNHRwTTROK3FCVlg3ZTBYdVF2SkdtdkpX?= =?utf-8?B?VVRSQlhyMzVWMDlteDFJWXE1aUVtZHdidUFHNGNJeWx4RytpaFFwYWY2Ynh6?= =?utf-8?B?Mk9QWitPTXF3UmJqZEJPU2JQdGdIUllRK2JZL0Jua1lyRC94UGVZWlo2N1dm?= =?utf-8?B?SFQ1Rkl6b3FWYTJjRVdEWTU2dElkRjVnL2U2bW02bWQ5ajlCTlExamsxL0Zt?= =?utf-8?B?b0h2M2dvcFFYK2QwS1R2ZmpIYkFDVnZCUVAyNU9CbTMwTHIza0xXTFBEWm5k?= =?utf-8?B?L0E0dnByU05KRGRqVnM4OVFBYTMvdHFocnM3QVRiTEpkRy9VVXA3QXpRSE5S?= =?utf-8?B?Yys0eThieVVpSEZiUkkzNmFUZk42SS9LbXpqMU9TSTVXdzhsdHNTb0xrKzEv?= =?utf-8?B?UkdJU1BxWlgwL1ZXcEIvekJtRHRaQUFybCt1T3czQmc4OERFSnAveVc5eUcw?= =?utf-8?B?ZHNIbFNHVlVBS3lGYVVUaWdLblNnYUJSMllvZTY0dXpLM3E5amtXSEVJSHQ1?= =?utf-8?B?bGMyWXd3bWFVbGFJdyttbVYxSWdVYVorbFFLekd5ZmZHY0VubVNRMWtMdFNY?= =?utf-8?B?clF4MmJpdE5hbnIvQkdySUw4eG5OZ0NhNnVIQmRTSGtXYVYrNUZGOFJFVml4?= =?utf-8?B?NzV5OVhRQWdVV09uWThXUmRMVUg4NUtlcnlETys1bWFvZFkrRFY3Q0VHbnVr?= =?utf-8?B?ektCVHhRTVNpZ3VZTnZkem1GMXEzQUhnd2FYRFdJMWRnZDNDM1Z4b0JMMHV0?= =?utf-8?B?OTJPMURYWHJWelhjdjgycUgwbExpNHI4aTJ5SHV1a3h6aWtpTVZyZzY0cmhB?= =?utf-8?B?MUljS013dStodHYvVWhUcmZrVFVVVWM2Q2t1TU5TVEdvaE9ZWEpDR2FBb0U0?= =?utf-8?B?RXdKZHVvZHBKME8zSnRtbGRpeXFhTEFCQ2IzYTQ0Ym9PZHl3dlNJS2pJTjRs?= =?utf-8?B?NjZQbHFsMTlVWmhzbS9DL29kUmFEV2luNWIzbVdnWG9IWWFrYWt5dXVEK25W?= =?utf-8?B?bXVLcHN5STB1YVp3RXFMSjNiUi9qOCtCY0NzWHhnWWZ3RkI4cTFtcjNGQUFH?= =?utf-8?B?YmdYc25PbXQvdm5RZCtqalBxWmgwRGhSY0t4SUc2R0pjZk94VW11Tm9YZFkz?= =?utf-8?B?cUFOMlhDZVRpNXN6dVhqYXhlaHNrOU5GU1RJelR1c1dHRzBBRnVkRW5iS1ox?= =?utf-8?B?L1U1TkJ5TkVCNE5pRVkvSlZQTi9hRkR5V29nVW9mRHNUN0YyamZFRS9jOEJT?= =?utf-8?B?VVQ3MGNqUjRiYUpwRnltOVI5R3BZSThKZDdvQjcwY002Y3dRZEY3ZVBwVlNH?= =?utf-8?B?T1QyenJXWlM1b2cvZjROcWNOT0d0M1hNNG5xNTNpd29DS1c3cjFka1I3K1gz?= =?utf-8?B?ZTgvS1kzdXJVUXZQcG9IYmRnZU9rWjZ1N0haTGNBdVNIdnVtK1pZR1dMeFdj?= =?utf-8?B?UXFDYTJ1TXkzdEw1bUh6dGJESjNSdUVSL2JtWGVvMXZLSnQ0UFBZcG1WZndn?= =?utf-8?B?RlB5VU55TkRJYy9uTEFOM01WZDFyNklyekNXeERrQ0YzM1hObExSU1BCVUNH?= =?utf-8?B?TlZKajFuMmp1NjA1VHpaUTRhVHY4SForcWozSDVTQlorbElnVXlibzJneTZK?= =?utf-8?Q?4LlsxgkX9wCGUIM3jsju?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 357a8b81-b04d-4cd6-a73b-08dbc19fe24e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2023 10:27:44.7709 (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: PAXP250MB0424 Subject: Re: [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 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: Andreas Rheinhardt: > 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); Will apply patches 7-14 tomorrow unless there are objections. - Andreas _______________________________________________ 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".