oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

试图解决编译错误

Browse Source
This commit is contained in:
Mike Solar
2025-06-18 20:42:45 +08:00
parent 5f9508434f
commit c04fceef9b
13 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+4 -4
View File
@@ -439,8 +439,8 @@ FootageDescription FFmpegDecoder::Probe(const QString &filename, CancelAtom *can
} else if (avstream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
// Create an audio stream object
AVChannelLayout channel_layout = avstream->codecpar->ch_layout;
if (!channel_layout.nb_channels==0) {
AVChannelLayout &channel_layout = avstream->codecpar->ch_layout;
if (!av_channel_layout_check(&channel_layout)) {
av_channel_layout_default(&channel_layout,avstream->codecpar->ch_layout.nb_channels);
}
@@ -557,10 +557,10 @@ bool FFmpegDecoder::ConformAudioInternal(const QVector<QString> &filenames, cons
return false;
}
// Create resampling context
AVChannelLayout layout=params.channel_layout();
std::shared_ptr<AVChannelLayout> layout=params.channel_layout();
SwrContext* resampler;
swr_alloc_set_opts2(&resampler,
&layout,
layout.get(),
FFmpegUtils::GetFFmpegSampleFormat(params.format()),
params.sample_rate(),
&channel_layout,