From b76e878f5b64587afa584e16ed8353c26d9cf10f Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 31 Mar 2017 18:21:52 +0200 Subject: rso: convert to new channel layout API Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/rsodec.c | 3 +-- libavformat/rsoenc.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index ffd0fdff0d..569368b422 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -62,8 +62,7 @@ static int rso_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = id; st->codecpar->codec_id = codec; - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = rate; st->codecpar->block_align = 1; diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index fc327d8a2f..858b53f6c6 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -34,7 +34,7 @@ static int rso_write_header(AVFormatContext *s) if (!par->codec_tag) return AVERROR_INVALIDDATA; - if (par->channels != 1) { + if (par->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "RSO only supports mono\n"); return AVERROR_INVALIDDATA; } -- cgit v1.2.3