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

2018-08-03 09:51:56 +10:00
parent 20fc7a2814 76b86ff3fd
commit 461cdeb57c
20 changed files with 197 additions and 324 deletions
@@ -91,7 +91,7 @@ void Clip::reset_audio() {
        audio_reset = true;
        frame_sample_index = 0;
        audio_buffer_write = 0;
-        reached_end = false;
+		reached_end = false;
        break;
    case MEDIA_TYPE_SEQUENCE:
    {