Merge branch 'master' of https://github.com/olive-editor/olive

2020-07-19 12:11:47 +10:00
parent 70b21d6c2a a772d9e739
commit c301f71d1a
2 changed files with 2 additions and 2 deletions
@@ -42,7 +42,7 @@ public:
  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;

 protected:
-  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const;
+  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const override;

 };