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 A4E7D40EAC for ; Wed, 9 Feb 2022 09:40:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D17668B21C; Wed, 9 Feb 2022 11:40:15 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0227968B0B6 for ; Wed, 9 Feb 2022 11:40:09 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 35510240179 for ; Wed, 9 Feb 2022 10:40:08 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id lJAsICEYg88T for ; Wed, 9 Feb 2022 10:40:07 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 639E2240175 for ; Wed, 9 Feb 2022 10:40:07 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 79B151601AD; Wed, 9 Feb 2022 10:40:07 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220113020242.661-7-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> <20220113020242.661-7-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Wed, 09 Feb 2022 10:40:07 +0100 Message-ID: <164439960747.19727.9920409459329434991@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 186/281] alac: convert to new channel layout API 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: Quoting James Almer (2022-01-13 03:02:19) > diff --git a/libavcodec/alac_data.h b/libavcodec/alac_data.h > index 650d6dcd15..a68a5f2648 100644 > --- a/libavcodec/alac_data.h > +++ b/libavcodec/alac_data.h > @@ -23,6 +23,8 @@ > > #include > > +#include "libavutil/channel_layout.h" > + > enum AlacRawDataBlockType { > /* At the moment, only SCE, CPE, LFE, and END are recognized. */ > TYPE_SCE, > @@ -39,7 +41,11 @@ enum AlacRawDataBlockType { > > extern const uint8_t ff_alac_channel_layout_offsets[ALAC_MAX_CHANNELS][ALAC_MAX_CHANNELS]; > > +extern const AVChannelLayout ff_alac_ch_layouts[ALAC_MAX_CHANNELS + 1]; > + > +#if FF_API_OLD_CHANNEL_LAYOUT > extern const uint64_t ff_alac_channel_layouts[ALAC_MAX_CHANNELS + 1]; > +#endif Kill this > @@ -616,6 +617,21 @@ static int alac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, > return 0; > } > > +#if FF_API_OLD_CHANNEL_LAYOUT > +const uint64_t alac_channel_layouts[ALAC_MAX_CHANNELS + 1] = { static -- Anton Khirnov _______________________________________________ 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".