Mercurial > libavcodec.hg
comparison vorbis_data.c @ 11977:032a8dc03ced libavcodec
Fix libvorbis encoding with more than 2 channels
Patch by James Darnley, james dot darnley at gmail
| author | mstorsjo |
|---|---|
| date | Sun, 27 Jun 2010 09:25:05 +0000 |
| parents | 98970e51365a |
| children | 8c82dfce2f24 |
comparison
equal
deleted
inserted
replaced
| 11976:19374f2992bf | 11977:032a8dc03ced |
|---|---|
| 28 { 0, 1, 2, 3, }, | 28 { 0, 1, 2, 3, }, |
| 29 { 0, 2, 1, 3, 4, }, | 29 { 0, 2, 1, 3, 4, }, |
| 30 { 0, 2, 1, 5, 3, 4, }, | 30 { 0, 2, 1, 5, 3, 4, }, |
| 31 { 0, 2, 1, 6, 5, 3, 4, }, | 31 { 0, 2, 1, 6, 5, 3, 4, }, |
| 32 { 0, 2, 1, 7, 5, 6, 3, 4}, | 32 { 0, 2, 1, 7, 5, 6, 3, 4}, |
| 33 }; | |
| 34 | |
| 35 const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = { | |
| 36 { 0, }, | |
| 37 { 0, 1, }, | |
| 38 { 0, 2, 1, }, | |
| 39 { 0, 1, 2, 3, }, | |
| 40 { 0, 2, 1, 3, 4, }, | |
| 41 { 0, 2, 1, 4, 5, 3, }, | |
| 42 { 0, 2, 1, 5, 6, 4, 3, }, | |
| 43 { 0, 2, 1, 6, 7, 4, 5, 3 } | |
| 33 }; | 44 }; |
| 34 | 45 |
| 35 const int64_t ff_vorbis_channel_layouts[9] = { | 46 const int64_t ff_vorbis_channel_layouts[9] = { |
| 36 CH_LAYOUT_MONO, | 47 CH_LAYOUT_MONO, |
| 37 CH_LAYOUT_STEREO, | 48 CH_LAYOUT_STEREO, |
