试图解决编译错误

# Conflicts: # app/codec/encoder.cpp # app/codec/encoder.h # app/codec/ffmpeg/ffmpegdecoder.cpp # ext/core
2025-08-03 22:50:16 +08:00
parent 46a913cc76
commit 34d44011f2
13 changed files with 60 additions and 51 deletions
@@ -44,12 +44,9 @@ public:
    return interlacing_combo_->GetInterlaceMode();
  }

-  int GetSelectedAudioSampleRate() const
-  {
-    return audio_sample_rate_field_->GetSampleRate();
-  }
+  int GetSelectedAudioSampleRate() const { return audio_sample_rate_field_->GetSampleRate(); }

-  uint64_t GetSelectedAudioChannelLayout() const
+  [[nodiscard]] AVChannelLayout GetSelectedAudioChannelLayout() const
  {
    return audio_channels_field_->GetChannelLayout();
  }