Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-03-31 18:58:46 +0300
committerJames Almer <jamrial@gmail.com>2022-03-15 15:42:35 +0300
commit5b51e6771c5419118dc02b325aafed37ce5cb709 (patch)
treee65e694bad4912bab7b9476bcb0ff67225c70df9 /libavformat/oggparseogm.c
parentf81417a6d2e2a200658c668b8414547a99f3d002 (diff)
ogg: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/oggparseogm.c')
-rw-r--r--libavformat/oggparseogm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index f777790523..1e794745ab 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -97,7 +97,7 @@ ogm_header(AVFormatContext *s, int idx)
st->codecpar->height = bytestream2_get_le32(&p);
avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
} else {
- st->codecpar->channels = bytestream2_get_le16(&p);
+ st->codecpar->ch_layout.nb_channels = bytestream2_get_le16(&p);
bytestream2_skip(&p, 2); /* block_align */
st->codecpar->bit_rate = bytestream2_get_le32(&p) * 8;
st->codecpar->sample_rate = spu * 10000000 / time_unit;
@@ -160,7 +160,7 @@ ogm_dshow_header(AVFormatContext *s, int idx)
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
- st->codecpar->channels = AV_RL16(p + 126);
+ st->codecpar->ch_layout.nb_channels = AV_RL16(p + 126);
st->codecpar->sample_rate = AV_RL32(p + 128);
st->codecpar->bit_rate = AV_RL32(p + 132) * 8;
}