From 869f41fc50415783a812364d2601e00bb71e5fde Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 9 May 2020 16:06:05 +1000 Subject: [PATCH] ffmpegdecoder: fixed audio bug that failed to conform if the codec didn't supply a channel layout --- app/codec/ffmpeg/ffmpegdecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp index abea45088..5b2c45a90 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.cpp +++ b/app/codec/ffmpeg/ffmpegdecoder.cpp @@ -835,7 +835,7 @@ bool FFmpegDecoder::ConformAudio(const QAtomicInt *cancelled, const AudioRenderi p.channel_layout(), FFmpegCommon::GetFFmpegSampleFormat(p.format()), p.sample_rate(), - static_cast(index_instance.stream()->codecpar->channel_layout), + channel_layout, static_cast(index_instance.stream()->codecpar->format), index_instance.stream()->codecpar->sample_rate, 0,