diff options
| author | Kyle Swanson <k@ylo.ph> | 2017-06-23 16:33:07 -0500 |
|---|---|---|
| committer | Kyle Swanson <k@ylo.ph> | 2017-06-26 09:46:58 -0500 |
| commit | c11ca6105e69750a233eb8a42462b27580da1ee5 (patch) | |
| tree | f17a6e7b165205fb183f550d00a79855b8daac4a /libavcodec/g722enc.c | |
| parent | 3c70251780647d49e09522bbe22758c841e37a9a (diff) | |
| download | ffmpeg-c11ca6105e69750a233eb8a42462b27580da1ee5.tar.gz | |
avcodec/g722enc: force mono channel layout
Signed-off-by: Kyle Swanson <k@ylo.ph>
Diffstat (limited to 'libavcodec/g722enc.c')
| -rw-r--r-- | libavcodec/g722enc.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 01a3db26fd..25b61df19e 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -61,11 +61,6 @@ static av_cold int g722_encode_init(AVCodecContext * avctx) G722Context *c = avctx->priv_data; int ret; - if (avctx->channels != 1) { - av_log(avctx, AV_LOG_ERROR, "Only mono tracks are allowed.\n"); - return AVERROR_INVALIDDATA; - } - c->band[0].scale_factor = 8; c->band[1].scale_factor = 2; c->prev_samples_pos = 22; @@ -381,15 +376,15 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } AVCodec ff_adpcm_g722_encoder = { - .name = "g722", - .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), - .type = AVMEDIA_TYPE_AUDIO, - .id = AV_CODEC_ID_ADPCM_G722, - .priv_data_size = sizeof(G722Context), - .init = g722_encode_init, - .close = g722_encode_close, - .encode2 = g722_encode_frame, - .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_NONE }, + .name = "g722", + .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_ADPCM_G722, + .priv_data_size = sizeof(G722Context), + .init = g722_encode_init, + .close = g722_encode_close, + .encode2 = g722_encode_frame, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, 0 }, }; |