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

试图解决编译错误

Browse Source 
# Conflicts:
#	app/codec/encoder.cpp
#	app/codec/encoder.h
#	app/codec/ffmpeg/ffmpegdecoder.cpp
#	ext/core
This commit is contained in:
Mike Solar
2025-08-03 22:50:16 +08:00
parent 46a913cc76
commit 34d44011f2
13 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegencoder.cpp
+1 -1
View File
@@ -334,7 +334,7 @@ bool FFmpegEncoder::WriteAudioData(const AudioParams &audio_params, const uint8_
int output_sample_count = input_sample_count ? swr_get_out_samples(audio_resample_ctx_, input_sample_count) : 102400;
uint8_t** output_data = nullptr;
int output_linesize;
av_samples_alloc_array_and_samples(&output_data, &output_linesize, audio_stream_->codecpar->channels,
av_samples_alloc_array_and_samples(&output_data, &output_linesize, audio_stream_->codecpar->ch_layout.nb_channels,
output_sample_count, static_cast<AVSampleFormat>(audio_stream_->codecpar->format), 0);
// Perform conversion