[FFmpeg-devel] [PATCH 186/281] alac: convert to new channel layout API

[Anton Khirnov]

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 <stdint.h>
>  
> +#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