diff options
| author | James Darnley <james.darnley@gmail.com> | 2010-06-27 09:25:05 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-06-27 09:25:05 +0000 |
| commit | 9577838f2f5439a8dd50ec549d6e21cf88e71b02 (patch) | |
| tree | 922943267c050cfd871fdd80e10ea1e128c808ab /libavcodec/vorbis_data.c | |
| parent | 9b1947c7f28045bc26459b821a5386a31a84e5a0 (diff) | |
Fix libvorbis encoding with more than 2 channels
Fixes issue 1325.
Patch by James Darnley, james dot darnley at gmail
Originally committed as revision 23818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vorbis_data.c')
| -rw-r--r-- | libavcodec/vorbis_data.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 9bc7979cdf..c504664aae 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -32,6 +32,17 @@ const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0, 2, 1, 7, 5, 6, 3, 4}, }; +const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = { + { 0, }, + { 0, 1, }, + { 0, 2, 1, }, + { 0, 1, 2, 3, }, + { 0, 2, 1, 3, 4, }, + { 0, 2, 1, 4, 5, 3, }, + { 0, 2, 1, 5, 6, 4, 3, }, + { 0, 2, 1, 6, 7, 4, 5, 3 } +}; + const int64_t ff_vorbis_channel_layouts[9] = { CH_LAYOUT_MONO, CH_LAYOUT_STEREO, |