PR #23337 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23337 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23337.patch
Pairing does not apply to LFE. >From c89d32b3ec6c0484d43c88a3e792910e4fa8aa59 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Thu, 4 Jun 2026 18:40:39 +0200 Subject: [PATCH] avcodec/aacenc: Remove excess initializers Pairing does not apply to LFE. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/aacenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 0d0dcb5126..eaf92ec00e 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -227,7 +227,7 @@ static const AACPCEInfo aac_pce_configs[] = { { .layout = AV_CHANNEL_LAYOUT_6POINT1, .num_ele = { 2, 0, 2, 1 }, - .pairing = { { 0, 1 }, { 0 }, { 1, 0 }, { 0 }, }, + .pairing = { { 0, 1 }, { 0 }, { 1, 0 } }, .index = { { 0, 0 }, { 0 }, { 1, 1 }, { 0 } }, .config_map = { 5, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_LFE }, .reorder_map = { 2, 0, 1, 5, 6, 4, 3 }, @@ -235,7 +235,7 @@ static const AACPCEInfo aac_pce_configs[] = { { .layout = AV_CHANNEL_LAYOUT_6POINT1_BACK, .num_ele = { 2, 0, 2, 1 }, - .pairing = { { 0, 1 },{ 0 },{ 1, 0 },{ 0 } }, + .pairing = { { 0, 1 },{ 0 },{ 1, 0 } }, .index = { { 0, 0 },{ 0 },{ 1, 1 },{ 0 } }, .config_map = { 5, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_SCE, TYPE_LFE }, .reorder_map = { 2, 0, 1, 4, 5, 6, 3 }, @@ -243,7 +243,7 @@ static const AACPCEInfo aac_pce_configs[] = { { .layout = AV_CHANNEL_LAYOUT_6POINT1_FRONT, .num_ele = { 2, 0, 1, 1 }, - .pairing = { { 1, 1 }, { 0 }, { 1 }, { 0 }, }, + .pairing = { { 1, 1 }, { 0 }, { 1 } }, .index = { { 0, 1 }, { 0 }, { 2 }, { 0 }, }, .config_map = { 3, TYPE_CPE, TYPE_CPE, TYPE_CPE, TYPE_LFE, }, .reorder_map = { 0, 1, 3, 4, 5, 6, 2 }, @@ -275,7 +275,7 @@ static const AACPCEInfo aac_pce_configs[] = { { .layout = AV_CHANNEL_LAYOUT_7POINT1_WIDE, .num_ele = { 3, 0, 1, 1 }, - .pairing = { { 0, 1, 1 }, { 0 }, { 1 }, { 0 }, }, + .pairing = { { 0, 1, 1 }, { 0 }, { 1 } }, .index = { { 0, 0, 1 }, { 0 }, { 2 }, { 0 }, }, .config_map = { 5, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_CPE, TYPE_LFE }, .reorder_map = { 2, 0, 1, 4, 5, 6, 7, 3 }, -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
