audioconvert: prefer 5.X over 5.X(side). This is the logical consequence of commit ab539d9e: 5.X(back) is more common than 5.X(side).

Nicolas George committed 15 years ago

Commit ada8d481 parent d3bc75c1 file · +2 −2Browse files

Unified · Split

libavutil/audioconvert.c+2−2

@@ -66,10 +66,10 @@ static const struct { · 65 unmodified lines
66	66	{ "stereo", 2, AV_CH_LAYOUT_STEREO },
67	67	{ "4.0", 4, AV_CH_LAYOUT_4POINT0 },
68	68	{ "quad", 4, AV_CH_LAYOUT_QUAD },
69		− { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 },
70	69	{ "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK },
71		− { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 },
	70	+ { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 },
72	71	{ "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK },
	72	+ { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 },
73	73	{ "7.1", 8, AV_CH_LAYOUT_7POINT1 },
74	74	{ "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
75	75	{ "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1\|AV_CH_LAYOUT_STEREO_DOWNMIX, },