merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -309,7 +309,7 @@ void process_effect(QOpenGLContext* ctx,
  }
 }

-GLuint compose_sequence(ComposeSequenceParams &params) {
+GLuint olive::rendering::compose_sequence(ComposeSequenceParams &params) {
  GLuint final_fbo = params.video ? params.main_buffer->buffer() : 0;

  Sequence* s = params.seq;
@@ -888,7 +888,7 @@ GLuint compose_sequence(ComposeSequenceParams &params) {
  return 0;
 }

-void compose_audio(Viewer* viewer, Sequence* seq, int playback_speed, bool wait_for_mutexes) {
+void olive::rendering::compose_audio(Viewer* viewer, Sequence* seq, int playback_speed, bool wait_for_mutexes) {
  ComposeSequenceParams params;
  params.viewer = viewer;
  params.ctx = nullptr;