From c1b86183916f04b7c27f324e97a602731e4f2fe3 Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sun, 14 Sep 2025 21:10:02 +0800 Subject: [PATCH] fix: crash when processing audio --- .gitmodules | 1 + app/codec/ffmpeg/ffmpegdecoder.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 55ea8f7de..f9f9206df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "ext/core"] path = ext/core url = https://github.com/OliveCommunity/core.git + branch = dev [submodule "ext/KDDockWidgets"] path = ext/KDDockWidgets url = https://github.com/olive-editor/KDDockWidgets.git diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp index e963e8e64..db5c4d588 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.cpp +++ b/app/codec/ffmpeg/ffmpegdecoder.cpp @@ -629,7 +629,7 @@ bool FFmpegDecoder::ConformAudioInternal(const QVector &filenames, } // Create resampling context AVChannelLayout layout = params.channel_layout(); - SwrContext *resampler; + SwrContext *resampler=NULL; swr_alloc_set_opts2( &resampler, &layout, FFmpegUtils::GetFFmpegSampleFormat(params.format()),