diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-05-29 08:34:13 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:41 -0300 |
| commit | 06431f1997935b322e15e48a67cdd8714a035701 (patch) | |
| tree | 611721fbb4555d2b6043db916e83167d700f9dab /libavcodec/ffwavesynth.c | |
| parent | 4d73dc14de8508886ed2c204f4fb1bc3022c04b2 (diff) | |
ffwavesynth: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/ffwavesynth.c')
| -rw-r--r-- | libavcodec/ffwavesynth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c index a1211facb9..229a89663d 100644 --- a/libavcodec/ffwavesynth.c +++ b/libavcodec/ffwavesynth.c @@ -314,7 +314,7 @@ static av_cold int wavesynth_init(AVCodecContext *avc) struct wavesynth_context *ws = avc->priv_data; int i, r; - if (avc->channels > WS_MAX_CHANNELS) { + if (avc->ch_layout.nb_channels > WS_MAX_CHANNELS) { av_log(avc, AV_LOG_ERROR, "This implementation is limited to %d channels.\n", WS_MAX_CHANNELS); @@ -438,11 +438,11 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame, return r; pcm = (int16_t *)frame->data[0]; for (s = 0; s < duration; s++, ts+=(uint64_t)1) { - memset(channels, 0, avc->channels * sizeof(*channels)); + memset(channels, 0, avc->ch_layout.nb_channels * sizeof(*channels)); if (ts >= ws->next_ts) wavesynth_enter_intervals(ws, ts); wavesynth_synth_sample(ws, ts, channels); - for (c = 0; c < avc->channels; c++) + for (c = 0; c < avc->ch_layout.nb_channels; c++) *(pcm++) = channels[c] >> 16; } ws->cur_ts += (uint64_t)duration; |