Merge pull request #1061 from arthenica/main-doc-update

update project README
arthenica · Nov 9, 2024 · ea8e8de · ea8e8de
2 parents e78b795 + 826fbb7
commit ea8e8de
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
 <img src="https://github.com/arthenica/ffmpeg-kit/blob/main/docs/assets/ffmpeg-kit-icon-v9.png" width="240">
 
-`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`<sup>1</sup> 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
+
+<sup>1</sup> `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)