From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/ra144dec.c | 4 ++--
libavcodec/ra144enc.c | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index b6272b343b..86d0d6e889 100644
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -39,8 +39,8 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
ractx->lpc_coef[0] = ractx->lpc_tables[0];
ractx->lpc_coef[1] = ractx->lpc_tables[1];
- avctx->channels = 1;
- avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ av_channel_layout_uninit(&avctx->ch_layout);
+ avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c
index 7a96354633..19d46ffe0c 100644
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@@ -51,11 +51,6 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx)
RA144Context *ractx;
int ret;
- if (avctx->channels != 1) {
- av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n",
- avctx->channels);
- return -1;
- }
avctx->frame_size = NBLOCKS * BLOCKSIZE;
avctx->initial_padding = avctx->frame_size;
avctx->bit_rate = 8000;
@@ -554,6 +549,9 @@ const AVCodec ff_ra_144_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.supported_samplerates = (const int[]){ 8000, 0 },
+#if FF_API_OLD_CHANNEL_LAYOUT
.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 },
+#endif
+ .ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 }
},
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
