diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 13:40:18 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:31 -0300 |
| commit | eaad010f7b7057d03ec3c8048dfe519f0226f203 (patch) | |
| tree | 2ad37bf446819960573a417009243240e7547803 /libavformat/cafdec.c | |
| parent | 658102a823ca2aaa9d241d825291a2b05af06626 (diff) | |
| download | ffmpeg-eaad010f7b7057d03ec3c8048dfe519f0226f203.tar.gz | |
caf: 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/cafdec.c')
| -rw-r--r-- | libavformat/cafdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 4b5b15b58d..f0c2c50c59 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -76,10 +76,10 @@ static int read_desc_chunk(AVFormatContext *s) caf->bytes_per_packet = avio_rb32(pb); st->codecpar->block_align = caf->bytes_per_packet; caf->frames_per_packet = avio_rb32(pb); - st->codecpar->channels = avio_rb32(pb); + st->codecpar->ch_layout.nb_channels = avio_rb32(pb); st->codecpar->bits_per_coded_sample = avio_rb32(pb); - if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->channels < 0) + if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->ch_layout.nb_channels < 0) return AVERROR_INVALIDDATA; /* calculate bit rate for constant size packets */ @@ -172,7 +172,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { // The data layout for Opus is currently unknown, so we do not export // extradata at all. Multichannel streams are not supported. - if (st->codecpar->channels > 2) { + if (st->codecpar->ch_layout.nb_channels > 2) { avpriv_request_sample(s, "multichannel Opus in CAF"); return AVERROR_PATCHWELCOME; } |