diff options
| author | Jörg Müller <nexyon@gmail.com> | 2021-05-27 20:05:17 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2021-05-27 20:05:17 +0300 |
| commit | 530f2994e9aeed551ce0cfec7a97a15234ebcb44 (patch) | |
| tree | d8b7bf409b9ae6a0f3f0cc38c19543db0b3c4cda /extern | |
| parent | dfa3dcbab9524e9f6da9be17eec4c74708a4889c (diff) | |
Fix T88614: Mixdown crashes Blender 2.92.0 and 3.0.0 Alpha
The problem is caused by the most recent ffmpeg version (4.4) which
needs channels to be set when submitting a frame for encoding.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp index 2cd3261bd20..10517d1d596 100644 --- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp +++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp @@ -75,6 +75,7 @@ void FFMPEGWriter::encode() m_frame->nb_samples = m_input_samples; m_frame->format = m_codecCtx->sample_fmt; m_frame->channel_layout = m_codecCtx->channel_layout; + m_frame->channels = m_specs.channels; if(avcodec_fill_audio_frame(m_frame, m_specs.channels, m_codecCtx->sample_fmt, reinterpret_cast<data_t*>(data), m_input_buffer.getSize(), 0) < 0) AUD_THROW(FileException, "File couldn't be written, filling the audio frame failed with ffmpeg."); |