Merge branch 'main' into development-react-native

.github/workflows/nightly-builds-android.yml

@@ -0,0 +1,71 @@
+name: nightly builds
+
+on:
+  schedule:
+    - cron:  '0 5 * * *'
+
+jobs:
+  build-android-main-on-linux:
+    name: android main on linux
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ndk-version: [ 'r23b-linux' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up adopt jdk 8
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'adopt'
+          java-version: '8'
+      - name: set up android ndk
+        run: |
+          curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
+          unzip -q -o ndk.zip -d .ndk
+          echo "ANDROID_NDK_ROOT=$PWD/.ndk/$(ls .ndk)" >> $GITHUB_ENV
+      - name: run the build script
+        run: ./android.sh --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-android-lts-on-linux:
+    name: android lts on linux
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ndk-version: [ 'r23b-linux' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up adopt jdk 8
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'adopt'
+          java-version: '8'
+      - name: set up android ndk
+        run: |
+          curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
+          unzip -q -o ndk.zip -d .ndk
+          echo "ANDROID_NDK_ROOT=$PWD/.ndk/$(ls .ndk)" >> $GITHUB_ENV
+      - name: run the build script
+        run: ./android.sh -l --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'

.github/workflows/nightly-builds-apple.yml

@@ -0,0 +1,151 @@
+name: apple nightly builds
+
+on:
+  schedule:
+    - cron:  '0 3 * * *'
+
+jobs:
+  build-ios-main-on-macos-bigsur:
+    name: ios main on big sur
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: [ '13.2.1' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./ios.sh -x --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-ios-lts-on-macos-catalina:
+    name: ios lts on catalina
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+        xcode: [ '12.4' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./ios.sh -l --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-macos-main-on-macos-bigsur:
+    name: macos main on big sur
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: [ '13.2.1' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./macos.sh -x --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-macos-lts-on-macos-catalina:
+    name: macos lts on catalina
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+        xcode: [ '12.4' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./macos.sh -l --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-tvos-main-on-macos-bigsur:
+    name: tvos main on big sur
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: [ '13.2.1' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./tvos.sh -x --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
+  build-tvos-lts-on-macos-catalina:
+    name: tvos lts on catalina
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+        xcode: [ '12.4' ]
+        branches: [ 'main', 'development' ]
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branches }}
+      - name: set up xcode
+        run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
+      - name: run the build script
+        run: ./tvos.sh -l --full --enable-gpl --disable-lib-srt
+      - name: print build logs
+        if: ${{ always() }}
+        run: cat build.log
+      - name: print ffbuild logs
+        if: ${{ failure() }}
+        run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'

android/ffmpeg-kit-android-lib/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 30
-    ndkVersion "23.1.7779620"
+    ndkVersion "22.1.7171670"
 
     defaultConfig {
         minSdkVersion 24

tools/release/android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 30
-    ndkVersion "23.1.7779620"
+    ndkVersion "22.1.7171670"
 
     defaultConfig {
         minSdkVersion 24

tools/release/android/build.lts.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 30
-    ndkVersion "23.1.7779620"
+    ndkVersion "22.1.7171670"
 
     defaultConfig {
         minSdkVersion 16