diff options
Diffstat (limited to 'libavformat/wavenc.c')
| -rw-r--r-- | libavformat/wavenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 2317700be1..5629bd487d 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -170,12 +170,12 @@ static av_cold int peak_init_writer(AVFormatContext *s) "Writing 16 bit peak for 8 bit audio does not make sense\n"); return AVERROR(EINVAL); } - if (par->channels > INT_MAX / (wav->peak_bps * wav->peak_ppv)) + if (par->ch_layout.nb_channels > INT_MAX / (wav->peak_bps * wav->peak_ppv)) return AVERROR(ERANGE); - wav->size_increment = par->channels * wav->peak_bps * wav->peak_ppv; + wav->size_increment = par->ch_layout.nb_channels * wav->peak_bps * wav->peak_ppv; - wav->peak_maxpos = av_calloc(par->channels, sizeof(*wav->peak_maxpos)); - wav->peak_maxneg = av_calloc(par->channels, sizeof(*wav->peak_maxneg)); + wav->peak_maxpos = av_calloc(par->ch_layout.nb_channels, sizeof(*wav->peak_maxpos)); + wav->peak_maxneg = av_calloc(par->ch_layout.nb_channels, sizeof(*wav->peak_maxneg)); if (!wav->peak_maxpos || !wav->peak_maxneg) goto nomem; @@ -205,7 +205,7 @@ static int peak_write_frame(AVFormatContext *s) } wav->peak_output = tmp; - for (c = 0; c < par->channels; c++) { + for (c = 0; c < par->ch_layout.nb_channels; c++) { wav->peak_maxneg[c] = -wav->peak_maxneg[c]; if (wav->peak_bps == 2 && wav->peak_format == PEAK_FORMAT_UINT8) { @@ -277,7 +277,7 @@ static int peak_write_chunk(AVFormatContext *s) avio_wl32(pb, wav->peak_format); /* 8 or 16 bit */ avio_wl32(pb, wav->peak_ppv); /* positive and negative */ avio_wl32(pb, wav->peak_block_size); /* frames per value */ - avio_wl32(pb, par->channels); /* number of channels */ + avio_wl32(pb, par->ch_layout.nb_channels); /* number of channels */ avio_wl32(pb, wav->peak_num_frames); /* number of peak frames */ avio_wl32(pb, -1); /* audio sample frame position (not implemented) */ avio_wl32(pb, 128); /* equal to size of header */ @@ -384,7 +384,7 @@ static int wav_write_packet(AVFormatContext *s, AVPacket *pkt) wav->peak_maxpos[c] = FFMAX(wav->peak_maxpos[c], (int16_t)AV_RL16(pkt->data + i)); wav->peak_maxneg[c] = FFMIN(wav->peak_maxneg[c], (int16_t)AV_RL16(pkt->data + i)); } - if (++c == s->streams[0]->codecpar->channels) { + if (++c == s->streams[0]->codecpar->ch_layout.nb_channels) { c = 0; if (++wav->peak_block_pos == wav->peak_block_size) { int ret = peak_write_frame(s); |