From 4e2b9df48c6aec982c239ced3e7a38255a287d20 Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 18 Dec 2024 20:41:13 -0300 Subject: [PATCH] avformat/isom: use more of the existing channel layout bitmap defines Signed-off-by: James Almer --- libavformat/isom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 01f9126d38..29171fea40 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -404,12 +404,12 @@ static const MovChannelLayout mov_channel_layout[] = { { AV_CH_LAYOUT_7POINT1, (128<<16) | 8}, // kCAFChannelLayoutTag_MPEG_7_1_C { AV_CH_LAYOUT_7POINT1_WIDE, (126<<16) | 8}, // kCAFChannelLayoutTag_MPEG_7_1_A { AV_CH_LAYOUT_5POINT1_BACK|AV_CH_LAYOUT_STEREO_DOWNMIX, (130<<16) | 8}, // kCAFChannelLayoutTag_SMPTE_DTV - { AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, (133<<16) | 3}, // kCAFChannelLayoutTag_DVD_4 + { AV_CH_LAYOUT_2POINT1, (133<<16) | 3}, // kCAFChannelLayoutTag_DVD_4 { AV_CH_LAYOUT_2_1|AV_CH_LOW_FREQUENCY, (134<<16) | 4}, // kCAFChannelLayoutTag_DVD_5 { AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY, (135<<16) | 4}, // kCAFChannelLayoutTag_DVD_6 { AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY, (135<<16) | 4}, // kCAFChannelLayoutTag_DVD_6 - { AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY, (136<<16) | 4}, // kCAFChannelLayoutTag_DVD_10 - { AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY, (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11 + { AV_CH_LAYOUT_3POINT1, (136<<16) | 4}, // kCAFChannelLayoutTag_DVD_10 + { AV_CH_LAYOUT_4POINT1, (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11 { 0, 0}, };