From 46990a835dd084e8294e74913daaa2c2ab31b2a2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2025 08:10:07 +0200 Subject: Support FFmpeg 8 (for Arch). --- src/lib/ffmpeg_file_encoder.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_file_encoder.cc') diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 9f391df5d..1a1f8fed6 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -73,7 +73,12 @@ public: _codec_context->bit_rate = channels * 128 * 1024; _codec_context->sample_fmt = sample_format; _codec_context->sample_rate = frame_rate; - av_channel_layout_default(&_codec_context->ch_layout, channels); + if (codec_name == "aac" && channels == 16) { + /* The default layout for AAC with 16 channels is not valid */ + _codec_context->ch_layout = AV_CHANNEL_LAYOUT_HEXADECAGONAL; + } else { + av_channel_layout_default(&_codec_context->ch_layout, channels); + } int r = avcodec_open2(_codec_context, _codec, 0); if (r < 0) { -- cgit v1.2.3