From: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/nutdec.c | 5 ++++-
libavformat/nutenc.c | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 0a8a700acf..8beec503e2 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -453,7 +453,8 @@ static int decode_stream_header(NUTContext *nut)
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
GET_V(st->codecpar->sample_rate, tmp > 0);
ffio_read_varlen(bc); // samplerate_den
- GET_V(st->codecpar->channels, tmp > 0);
+ GET_V(st->codecpar->ch_layout.nb_channels, tmp > 0);
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
}
if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR,
@@ -953,8 +954,10 @@ static int read_sm_data(AVFormatContext *s, AVIOContext
*bc, AVPacket *pkt, int
if (!dst)
return AVERROR(ENOMEM);
bytestream_put_le32(&dst,
+#if FF_API_OLD_CHANNEL_LAYOUT
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT*(!!channels) +
AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT*(!!channel_layout) +
+#endif
AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) +
AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height))
);
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 9d5eb4ed99..f88b424429 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -461,7 +461,7 @@ static int write_streamheader(AVFormatContext *avctx,
AVIOContext *bc,
case AVMEDIA_TYPE_AUDIO:
put_v(bc, par->sample_rate);
put_v(bc, 1);
- put_v(bc, par->channels);
+ put_v(bc, par->ch_layout.nb_channels);
break;
case AVMEDIA_TYPE_VIDEO:
put_v(bc, par->width);
--
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".
