RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-20 14:20:51 +00:00
Code Issues Projects Releases Wiki Activity

libmp3lame: set supported channel layouts.

Browse Source
This commit is contained in:
Anton Khirnov 2012-05-07 21:40:20 +02:00
parent 6eeb9a0433
commit e6694659fc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libmp3lame.c
View File

@ -26,6 +26,7 @@
#include <lame/lame.h> #include <lame/lame.h>
#include "libavutil/audioconvert.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
@ -76,11 +77,6 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx)
if ((s->gfp = lame_init()) == NULL) if ((s->gfp = lame_init()) == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
/* channels */
if (avctx->channels > 2) {
ret = AVERROR(EINVAL);
goto error;
}
lame_set_num_channels(s->gfp, avctx->channels); lame_set_num_channels(s->gfp, avctx->channels);
lame_set_mode(s->gfp, avctx->channels > 1 ? JOINT_STEREO : MONO); lame_set_mode(s->gfp, avctx->channels > 1 ? JOINT_STEREO : MONO);
@ -308,6 +304,8 @@ AVCodec ff_libmp3lame_encoder = {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.supported_samplerates = libmp3lame_sample_rates, .supported_samplerates = libmp3lame_sample_rates,
.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO },
.long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
.priv_class = &libmp3lame_class, .priv_class = &libmp3lame_class,
.defaults = libmp3lame_defaults, .defaults = libmp3lame_defaults,