From a02663d997c1fd7cb8b5456e57cbbcff6632283d Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 15 Mar 2022 10:26:40 -0300 Subject: avcodec/audiotoolboxenc: use the correct macros for standard channel layouts Signed-off-by: James Almer --- libavcodec/audiotoolboxenc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 4f43d8e43b..2092b7a26a 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -204,19 +204,19 @@ static int get_aac_tag(const AVChannelLayout *in_layout) AVChannelLayout chl; int tag; } map[] = { - { AV_CH_LAYOUT_MONO, kAudioChannelLayoutTag_Mono }, - { AV_CH_LAYOUT_STEREO, kAudioChannelLayoutTag_Stereo }, - { AV_CH_LAYOUT_QUAD, kAudioChannelLayoutTag_AAC_Quadraphonic }, - { AV_CH_LAYOUT_OCTAGONAL, kAudioChannelLayoutTag_AAC_Octagonal }, - { AV_CH_LAYOUT_SURROUND, kAudioChannelLayoutTag_AAC_3_0 }, - { AV_CH_LAYOUT_4POINT0, kAudioChannelLayoutTag_AAC_4_0 }, - { AV_CH_LAYOUT_5POINT0, kAudioChannelLayoutTag_AAC_5_0 }, - { AV_CH_LAYOUT_5POINT1, kAudioChannelLayoutTag_AAC_5_1 }, - { AV_CH_LAYOUT_6POINT0, kAudioChannelLayoutTag_AAC_6_0 }, - { AV_CH_LAYOUT_6POINT1, kAudioChannelLayoutTag_AAC_6_1 }, - { AV_CH_LAYOUT_7POINT0, kAudioChannelLayoutTag_AAC_7_0 }, - { AV_CH_LAYOUT_7POINT1_WIDE_BACK, kAudioChannelLayoutTag_AAC_7_1 }, - { AV_CH_LAYOUT_7POINT1, kAudioChannelLayoutTag_MPEG_7_1_C }, + { AV_CHANNEL_LAYOUT_MONO, kAudioChannelLayoutTag_Mono }, + { AV_CHANNEL_LAYOUT_STEREO, kAudioChannelLayoutTag_Stereo }, + { AV_CHANNEL_LAYOUT_QUAD, kAudioChannelLayoutTag_AAC_Quadraphonic }, + { AV_CHANNEL_LAYOUT_OCTAGONAL, kAudioChannelLayoutTag_AAC_Octagonal }, + { AV_CHANNEL_LAYOUT_SURROUND, kAudioChannelLayoutTag_AAC_3_0 }, + { AV_CHANNEL_LAYOUT_4POINT0, kAudioChannelLayoutTag_AAC_4_0 }, + { AV_CHANNEL_LAYOUT_5POINT0, kAudioChannelLayoutTag_AAC_5_0 }, + { AV_CHANNEL_LAYOUT_5POINT1, kAudioChannelLayoutTag_AAC_5_1 }, + { AV_CHANNEL_LAYOUT_6POINT0, kAudioChannelLayoutTag_AAC_6_0 }, + { AV_CHANNEL_LAYOUT_6POINT1, kAudioChannelLayoutTag_AAC_6_1 }, + { AV_CHANNEL_LAYOUT_7POINT0, kAudioChannelLayoutTag_AAC_7_0 }, + { AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, kAudioChannelLayoutTag_AAC_7_1 }, + { AV_CHANNEL_LAYOUT_7POINT1, kAudioChannelLayoutTag_MPEG_7_1_C }, }; int i; -- cgit v1.2.3