[FFmpeg-devel] [PATCH 118/281] oss: port to new channel layout API

[James Almer]

From: Anton Khirnov <anton at khirnov.net>

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavdevice/oss_dec.c | 3 ++-
 libavdevice/oss_enc.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavdevice/oss_dec.c b/libavdevice/oss_dec.c
index 4f3772c1f5..d3fc59d0ea 100644
--- a/libavdevice/oss_dec.c
+++ b/libavdevice/oss_dec.c
@@ -59,7 +59,8 @@ static int audio_read_header(AVFormatContext *s1)
     st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codecpar->codec_id = s->codec_id;
     st->codecpar->sample_rate = s->sample_rate;
-    st->codecpar->channels = s->channels;
+    st->codecpar->ch_layout.nb_channels = s->channels;
+    st->codecpar->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
 
     avpriv_set_pts_info(st, 64, 1, 1000000);  /* 64 bits pts in us */
     return 0;
diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c
index 3103d2de9a..d6a512a264 100644
--- a/libavdevice/oss_enc.c
+++ b/libavdevice/oss_enc.c
@@ -43,7 +43,7 @@ static int audio_write_header(AVFormatContext *s1)
 
     st = s1->streams[0];
     s->sample_rate = st->codecpar->sample_rate;
-    s->channels = st->codecpar->channels;
+    s->channels = st->codecpar->ch_layout.nb_channels;
     ret = ff_oss_audio_open(s1, 1, s1->url);
     if (ret < 0) {
         return AVERROR(EIO);
-- 
2.34.1