From 2d2310551f00834e6cf3c759c2bd9e110b4a03c6 Mon Sep 17 00:00:00 2001
From: Simran Spiller <simran.spiller@gmail.com>
Date: Mon, 12 Oct 2020 16:56:11 +0200
Subject: [PATCH 1/4] Only specify major version for actions

This updates msvc-dev-cmd and install-qt-action, which should make more set-env deprecation warnings go away
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d43e7f2f..c4811bd47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,10 +152,10 @@ jobs:
           cmake -E make_directory ${{ runner.workspace }}/build
 
       - name: Enable Developer Command Prompt (Windows)
-        uses: ilammy/msvc-dev-cmd@v1.3.0
+        uses: ilammy/msvc-dev-cmd@v1
 
       - name: Acquire Qt
-        uses: jurplel/install-qt-action@v2.8.0
+        uses: jurplel/install-qt-action@v2
         with:
           version: 5.15.1
 
@@ -323,7 +323,7 @@ jobs:
           cmake -E make_directory ${{ runner.workspace }}/build
 
       - name: Acquire Qt
-        uses: jurplel/install-qt-action@v2.8.0
+        uses: jurplel/install-qt-action@v2
         with:
           version: 5.15.1
 

From 9657e945eac6006ede05ff5258b8bde50f10ab44 Mon Sep 17 00:00:00 2001
From: Simran Spiller <simran.spiller@gmail.com>
Date: Mon, 12 Oct 2020 16:59:36 +0200
Subject: [PATCH 2/4] Workaround with unique matrix key shouldn't be necessary

If the matrix has non-unique keys, then an artifical unique key is required in order to match the correct include element, or the last one will overwrite other non-unique
---
 .github/workflows/ci.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4811bd47..c27a72ff7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [1, 2]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             cc-compiler: gcc
             cxx-compiler: g++
             compiler-name: GCC 9.3.1
@@ -31,8 +29,7 @@ jobs:
             os-name: Linux (CentOS 7)
             vfx-cy: 2021
             ci-common-version: 2
-          - build: 2
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             cc-compiler: clang
             cxx-compiler: clang++
             compiler-name: Clang 10.0.0
@@ -117,10 +114,8 @@ jobs:
   windows:
     strategy:
       matrix:
-        build: [1]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             compiler-name: MSVC 16.x
             os-name: Windows
             os-arch: x86_64
@@ -288,10 +283,8 @@ jobs:
   macos:
     strategy:
       matrix:
-        build: [1]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             compiler-name: Clang LLVM
             os-name: macOS
             os-arch: x86_64

From 56acbfd06c8ad0ac10434a2b40561ddd6101917d Mon Sep 17 00:00:00 2001
From: Simran Spiller <simran.spiller@gmail.com>
Date: Mon, 12 Oct 2020 17:14:12 +0200
Subject: [PATCH 3/4] Skip CI if message of head commit contains [skip ci]

Note: github.event.head_commit.message is potentially not available in
on: pull_request payload. May need to find an alternative when this is
added as trigger.
---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c27a72ff7..f68c7c77a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,6 +47,8 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: olivevideoeditor/ci-olive:${{ matrix.vfx-cy }}.${{ matrix.ci-common-version }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code
@@ -129,6 +131,8 @@ jobs:
        ${{ matrix.build-type }},
        ${{ matrix.cmake-gen }}>
     runs-on: ${{ matrix.os }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code
@@ -298,6 +302,8 @@ jobs:
        ${{ matrix.build-type }},
        ${{ matrix.cmake-gen }}>
     runs-on: ${{ matrix.os }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code

From b676f2f8b6a74e207c6f818cd26a50a6fdb0e4ec Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Fri, 9 Oct 2020 23:07:25 +0100
Subject: [PATCH 4/4] Fix #1252

Checks if the SampleBuffer is valid before trying to extract its
packed data. If it is not valid Olive writes blank segments instead.
---
 app/render/audioplaybackcache.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index 2e3630a7c..f2fc961a8 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -75,8 +75,11 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
     segment_length_ += seg_sz;
   }
 
-  // Convert to packed data, which is what we store on disk
-  QByteArray a = samples->toPackedData();
+  QByteArray a;
+  if (samples) {
+    // Convert to packed data, which is what we store on disk
+    a = samples->toPackedData();
+  }
 
   // Keep track of validated ranges so we can signal them all at once at the end
   TimeRangeList ranges_we_validated;