diff --git a/.github/workflows/android-build-scripts.yml b/.github/workflows/android-build-scripts.yml
index 51005c2..921f12a 100644
--- a/.github/workflows/android-build-scripts.yml
+++ b/.github/workflows/android-build-scripts.yml
@@ -118,7 +118,7 @@ jobs:
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
build-lts-on-macos:
name: android lts on macos
- runs-on: macos-11
+ runs-on: macos-12
strategy:
matrix:
ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ]
diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml
index de252d6..40387ce 100644
--- a/.github/workflows/ios-build-scripts.yml
+++ b/.github/workflows/ios-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
defaults:
run:
shell: bash
diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml
index f4f2228..d76fcfe 100644
--- a/.github/workflows/macos-build-scripts.yml
+++ b/.github/workflows/macos-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
defaults:
run:
shell: bash
diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml
index 24ab696..6b3b19b 100644
--- a/.github/workflows/periodic-builds-apple.yml
+++ b/.github/workflows/periodic-builds-apple.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
branches: [ 'main', 'development' ]
defaults:
run:
@@ -62,7 +62,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
branches: [ 'main', 'development' ]
defaults:
run:
@@ -114,7 +114,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
branches: [ 'main', 'development' ]
defaults:
run:
diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml
index 356a414..eaee3ab 100644
--- a/.github/workflows/tvos-build-scripts.yml
+++ b/.github/workflows/tvos-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
runs-on: macos-14
strategy:
matrix:
- xcode: [ '14.3.1', '15.3' ]
+ xcode: [ '15.4', '16.0' ]
defaults:
run:
shell: bash
diff --git a/README.md b/README.md
index 454ae6d..68ed59d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
-`FFmpegKit` is a collection of tools to use `FFmpeg` in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications.
+`FFmpegKit` is a collection of tools to use `FFmpeg`1 in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications.
It includes scripts to build `FFmpeg` native libraries, a wrapper library to run `FFmpeg`/`FFprobe` commands in
applications and 8 prebuilt binary packages available at [Github](https://github.com/arthenica/ffmpeg-kit/releases),
@@ -219,11 +219,15 @@ that you seek legal advice first. See [FFmpeg Patent Mini-FAQ](https://ffmpeg.or
distribute that library, then you are subject to pay MPEG LA licensing fees. Refer to
[OpenH264 FAQ](https://www.openh264.org/faq.html) page for the details.
-### 16. Contributing
+### 16. Trademarks
+
+1 `FFmpeg` is a trademark of [Fabrice Bellard](http://www.bellard.org/). `FFmpegKit` is an independent project and not affiliated with the `FFmpeg` trademark holder.
+
+### 17. Contributing
See our [CONTRIBUTING](CONTRIBUTING.md) guide.
-### 17. See Also
+### 18. See Also
- [FFmpeg API Documentation](https://ffmpeg.org/doxygen/4.0/index.html)
- [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart)