From 5d5b87f68885f35ff365d1e64446c1676b4a9993 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 30 Oct 2022 16:46:48 -0300 Subject: [PATCH] avformat/mov_chan: use the cube layout Signed-off-by: James Almer --- libavformat/mov_chan.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 5b757c6a8a..f66bf0df7f 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -172,11 +172,7 @@ static const struct MovChannelLayoutMap mov_ch_layout_map_8ch[] = { { MOV_CH_LAYOUT_OCTAGONAL, AV_CH_LAYOUT_OCTAGONAL }, // L, R, Rls, Rrs, C, Cs, Ls, Rs { MOV_CH_LAYOUT_AAC_OCTAGONAL, AV_CH_LAYOUT_OCTAGONAL }, // C, L, R, Ls, Rs, Rls, Rrs, Cs - { MOV_CH_LAYOUT_CUBE, AV_CH_LAYOUT_QUAD | // L, R, Rls, Rrs, Vhl, Vhr, Rlt, Rrt - AV_CH_TOP_FRONT_LEFT | - AV_CH_TOP_FRONT_RIGHT | - AV_CH_TOP_BACK_LEFT | - AV_CH_TOP_BACK_RIGHT }, + { MOV_CH_LAYOUT_CUBE, AV_CH_LAYOUT_CUBE }, // L, R, Rls, Rrs, Vhl, Vhr, Rlt, Rrt { MOV_CH_LAYOUT_MPEG_7_1_A, AV_CH_LAYOUT_7POINT1_WIDE }, // L, R, C, LFE, Ls, Rs, Lc, Rc { MOV_CH_LAYOUT_MPEG_7_1_B, AV_CH_LAYOUT_7POINT1_WIDE }, // C, Lc, Rc, L, R, Ls, Rs, LFE