Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

nistspheredec: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
release/5.1
Anton Khirnov 5 years ago committed by James Almer
parent 29e61ef5d6
commit 80005b681e
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavformat/nistspheredec.c

7
libavformat/nistspheredec.c
Unescape View File

@ -80,7 +80,8 @@ static int nist_read_header(AVFormatContext *s)
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8; st->codecpar->block_align = st->codecpar->bits_per_coded_sample *
st->codecpar->ch_layout.nb_channels / 8;
if (avio_tell(s->pb) > header_size) if (avio_tell(s->pb) > header_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -89,8 +90,8 @@ static int nist_read_header(AVFormatContext *s)
return 0; return 0;
} else if (!memcmp(buffer, "channel_count", 13)) { } else if (!memcmp(buffer, "channel_count", 13)) {
sscanf(buffer, "%*s %*s %u", &st->codecpar->channels); sscanf(buffer, "%*s %*s %u", &st->codecpar->ch_layout.nb_channels);
if (st->codecpar->channels <= 0 || st->codecpar->channels > INT16_MAX) if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->ch_layout.nb_channels > INT16_MAX)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (!memcmp(buffer, "sample_byte_format", 18)) { } else if (!memcmp(buffer, "sample_byte_format", 18)) {
sscanf(buffer, "%*s %*s %31s", format); sscanf(buffer, "%*s %*s %31s", format);

Write Preview
Loading…
Cancel
Save