---
libavutil/channel_layout.c | 55 +++++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 253c495..188ed50 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -70,34 +70,33 @@ static const struct {
int nb_channels;
uint64_t layout;
} channel_layout_map[] = {
- { "mono", 1, AV_CH_LAYOUT_MONO },
- { "stereo", 2, AV_CH_LAYOUT_STEREO },
- { "stereo", 2, AV_CH_LAYOUT_STEREO_DOWNMIX },
- { "2.1", 3, AV_CH_LAYOUT_2POINT1 },
- { "3.0", 3, AV_CH_LAYOUT_SURROUND },
- { "3.0(back)", 3, AV_CH_LAYOUT_2_1 },
- { "3.1", 4, AV_CH_LAYOUT_3POINT1 },
- { "4.0", 4, AV_CH_LAYOUT_4POINT0 },
- { "quad", 4, AV_CH_LAYOUT_QUAD },
- { "quad(side)", 4, AV_CH_LAYOUT_2_2 },
- { "4.1", 5, AV_CH_LAYOUT_4POINT1 },
- { "5.0", 5, AV_CH_LAYOUT_5POINT0 },
- { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK },
- { "5.1", 6, AV_CH_LAYOUT_5POINT1 },
- { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK },
- { "6.0", 6, AV_CH_LAYOUT_6POINT0 },
- { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT },
- { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL },
- { "6.1", 7, AV_CH_LAYOUT_6POINT1 },
- { "6.1", 7, AV_CH_LAYOUT_6POINT1_BACK },
- { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT },
- { "7.0", 7, AV_CH_LAYOUT_7POINT0 },
- { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT },
- { "7.1", 8, AV_CH_LAYOUT_7POINT1 },
- { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
- { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK },
- { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL },
- { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, },
+ { "mono", 1, AV_CH_LAYOUT_MONO },
+ { "stereo", 2, AV_CH_LAYOUT_STEREO },
+ { "stereo(downmix)", 2, AV_CH_LAYOUT_STEREO_DOWNMIX },
+ { "2.1", 3, AV_CH_LAYOUT_2POINT1 },
+ { "3.0(surround)", 3, AV_CH_LAYOUT_SURROUND },
+ { "3.0(back)", 3, AV_CH_LAYOUT_2_1 },
+ { "3.1", 4, AV_CH_LAYOUT_3POINT1 },
+ { "4.0", 4, AV_CH_LAYOUT_4POINT0 },
+ { "quad", 4, AV_CH_LAYOUT_QUAD },
+ { "quad(side)", 4, AV_CH_LAYOUT_2_2 },
+ { "4.1", 5, AV_CH_LAYOUT_4POINT1 },
+ { "5.0", 5, AV_CH_LAYOUT_5POINT0 },
+ { "5.0(back)", 5, AV_CH_LAYOUT_5POINT0_BACK },
+ { "5.1", 6, AV_CH_LAYOUT_5POINT1 },
+ { "5.1(back)", 6, AV_CH_LAYOUT_5POINT1_BACK },
+ { "6.0", 6, AV_CH_LAYOUT_6POINT0 },
+ { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT },
+ { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL },
+ { "6.1", 7, AV_CH_LAYOUT_6POINT1 },
+ { "6.1(back)", 7, AV_CH_LAYOUT_6POINT1_BACK },
+ { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT },
+ { "7.0", 7, AV_CH_LAYOUT_7POINT0 },
+ { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT },
+ { "7.1", 8, AV_CH_LAYOUT_7POINT1 },
+ { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
+ { "7.1(wide back)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK },
+ { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL },
{ 0 }
};
--
2.1.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
