virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libopusenc: use more specific and correct name for the channel order

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-02 17:34:10 +02:00
parent e88ca80dc3
commit f5b31daa5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libopusenc.c
View File

@ -65,8 +65,8 @@ static const uint8_t opus_vorbis_channel_map[8][8] = {
{ 0, 6, 1, 2, 3, 4, 5, 7 }, { 0, 6, 1, 2, 3, 4, 5, 7 },
}; };
/* libav to libopus channel order mapping, passed to libopus */ /* libavcodec to libopus channel order mapping, passed to libopus */
static const uint8_t libav_libopus_channel_map[8][8] = { static const uint8_t libavcodec_libopus_channel_map[8][8] = {
{ 0 }, { 0 },
{ 0, 1 }, { 0, 1 },
{ 0, 1, 2 }, { 0, 1, 2 },
@ -159,7 +159,7 @@ static int av_cold libopus_encode_init(AVCodecContext *avctx)
coupled_stream_count = opus_coupled_streams[avctx->channels - 1]; coupled_stream_count = opus_coupled_streams[avctx->channels - 1];
opus->stream_count = avctx->channels - coupled_stream_count; opus->stream_count = avctx->channels - coupled_stream_count;
channel_mapping = libav_libopus_channel_map[avctx->channels - 1]; channel_mapping = libavcodec_libopus_channel_map[avctx->channels - 1];
/* FIXME: Opus can handle up to 255 channels. However, the mapping for /* FIXME: Opus can handle up to 255 channels. However, the mapping for
* anything greater than 8 is undefined. */ * anything greater than 8 is undefined. */