diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-05-29 09:36:27 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:43 -0300 |
| commit | d4b79b2e3272877714c092529d3584c61de82266 (patch) | |
| tree | a194e307d9de0c5d4a7df1685475c0ae2fba1cc5 /libavcodec/mlp.c | |
| parent | 6d8b25841ca47a03abd1cab95be3ec5810bdf84f (diff) | |
| download | ffmpeg-d4b79b2e3272877714c092529d3584c61de82266.tar.gz | |
mlp: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mlp.c')
| -rw-r--r-- | libavcodec/mlp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c index dcec145eb0..3f54b2e448 100644 --- a/libavcodec/mlp.c +++ b/libavcodec/mlp.c @@ -57,12 +57,21 @@ const ChannelInformation ff_mlp_ch_info[21] = { { 0x3F, 0x04, 0x02, 0x00 }, }; +#if FF_API_OLD_CHANNEL_LAYOUT const uint64_t ff_mlp_channel_layouts[12] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_QUAD, AV_CH_LAYOUT_2POINT1, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_3POINT1, AV_CH_LAYOUT_4POINT1, AV_CH_LAYOUT_5POINT1_BACK, 0, }; +#endif + +const AVChannelLayout ff_mlp_ch_layouts[12] = { + AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_2_1, + AV_CHANNEL_LAYOUT_QUAD, AV_CHANNEL_LAYOUT_2POINT1, AV_CHANNEL_LAYOUT_SURROUND, + AV_CHANNEL_LAYOUT_4POINT0, AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_3POINT1, + AV_CHANNEL_LAYOUT_4POINT1, AV_CHANNEL_LAYOUT_5POINT1_BACK, { 0 }, +}; #if CONFIG_SMALL #define CRC_TABLE_SIZE 257 |