merged with master

rendering/renderfunctions.h

@@ -191,6 +191,8 @@ struct ComposeSequenceParams {
     const FramebufferObject* backend_buffer2;
 };
 
+namespace olive {
+namespace rendering {
 /**
   * @brief Compose a frame of a given sequence
   *
@@ -239,6 +241,8 @@ GLuint compose_sequence(ComposeSequenceParams &params);
  * Whether to wait for media to open or simply fail if the media is not yet open. This should usually be **FALSE**.
  */
 void compose_audio(Viewer* viewer, Sequence *seq, int playback_speed, bool wait_for_mutexes);
+}
+}
 
 /**
   * @brief Rescale a frame number between two frame rates