diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-11-06 17:05:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-07 01:38:56 +0100 |
| commit | ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a (patch) | |
| tree | 00501751b8f66e041c11ae5b642f43fb5067a325 | |
| parent | d3bc75c666704cfefcf7a46cb3f20ef35383b996 (diff) | |
| download | ffmpeg-ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a.tar.gz | |
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).
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/audioconvert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index f4c74f6a1a..0bcc9b72e5 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -66,10 +66,10 @@ static const struct { { "stereo", 2, AV_CH_LAYOUT_STEREO }, { "4.0", 4, AV_CH_LAYOUT_4POINT0 }, { "quad", 4, AV_CH_LAYOUT_QUAD }, - { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 }, { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, - { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, + { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 }, { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, + { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, |