From: Vittorio Giovara <vittorio.giov...@gmail.com>
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>
---
libavformat/mmf.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 0c067a1025..4c3ef3456b 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -80,7 +80,7 @@ static int mmf_write_header(AVFormatContext *s)
return AVERROR(EINVAL);
}
- mmf->stereo = s->streams[0]->codecpar->channels > 1;
+ mmf->stereo = s->streams[0]->codecpar->ch_layout.nb_channels > 1;
if (mmf->stereo &&
s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(s, AV_LOG_ERROR, "Yamaha SMAF stereo is experimental, "
@@ -261,8 +261,7 @@ static int mmf_read_header(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
st->codecpar->sample_rate = rate;
- st->codecpar->channels = (params >> 7) + 1;
- st->codecpar->channel_layout = params >> 7 ? AV_CH_LAYOUT_STEREO :
AV_CH_LAYOUT_MONO;
+ av_channel_layout_default(&st->codecpar->ch_layout, (params >> 7) + 1);
st->codecpar->bits_per_coded_sample = 4;
st->codecpar->bit_rate = st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample;
--
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".
