From 530f2994e9aeed551ce0cfec7a97a15234ebcb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Thu, 27 May 2021 19:05:17 +0200 Subject: 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. --- extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'extern/audaspace') 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), m_input_buffer.getSize(), 0) < 0) AUD_THROW(FileException, "File couldn't be written, filling the audio frame failed with ffmpeg."); -- cgit v1.2.3