Skip to content

Commit ea8e8de

Browse files
authored
Merge pull request #1061 from arthenica/main-doc-update
update project README
2 parents e78b795 + 826fbb7 commit ea8e8de

6 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/android-build-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
119119
build-lts-on-macos:
120120
name: android lts on macos
121-
runs-on: macos-11
121+
runs-on: macos-12
122122
strategy:
123123
matrix:
124124
ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ]

.github/workflows/ios-build-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: macos-14
3333
strategy:
3434
matrix:
35-
xcode: [ '14.3.1', '15.3' ]
35+
xcode: [ '15.4', '16.0' ]
3636
defaults:
3737
run:
3838
shell: bash

.github/workflows/macos-build-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: macos-14
3333
strategy:
3434
matrix:
35-
xcode: [ '14.3.1', '15.3' ]
35+
xcode: [ '15.4', '16.0' ]
3636
defaults:
3737
run:
3838
shell: bash

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: macos-14
1111
strategy:
1212
matrix:
13-
xcode: [ '14.3.1', '15.3' ]
13+
xcode: [ '15.4', '16.0' ]
1414
branches: [ 'main', 'development' ]
1515
defaults:
1616
run:
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: macos-14
6363
strategy:
6464
matrix:
65-
xcode: [ '14.3.1', '15.3' ]
65+
xcode: [ '15.4', '16.0' ]
6666
branches: [ 'main', 'development' ]
6767
defaults:
6868
run:
@@ -114,7 +114,7 @@ jobs:
114114
runs-on: macos-14
115115
strategy:
116116
matrix:
117-
xcode: [ '14.3.1', '15.3' ]
117+
xcode: [ '15.4', '16.0' ]
118118
branches: [ 'main', 'development' ]
119119
defaults:
120120
run:

.github/workflows/tvos-build-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: macos-14
3333
strategy:
3434
matrix:
35-
xcode: [ '14.3.1', '15.3' ]
35+
xcode: [ '15.4', '16.0' ]
3636
defaults:
3737
run:
3838
shell: bash

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<img src="https://github.com/arthenica/ffmpeg-kit/blob/main/docs/assets/ffmpeg-kit-icon-v9.png" width="240">
44

5-
`FFmpegKit` is a collection of tools to use `FFmpeg` in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications.
5+
`FFmpegKit` is a collection of tools to use `FFmpeg`<sup>1</sup> in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications.
66

77
It includes scripts to build `FFmpeg` native libraries, a wrapper library to run `FFmpeg`/`FFprobe` commands in
88
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
219219
distribute that library, then you are subject to pay MPEG LA licensing fees. Refer to
220220
[OpenH264 FAQ](https://www.openh264.org/faq.html) page for the details.
221221

222-
### 16. Contributing
222+
### 16. Trademarks
223+
224+
<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.
225+
226+
### 17. Contributing
223227

224228
See our [CONTRIBUTING](CONTRIBUTING.md) guide.
225229

226-
### 17. See Also
230+
### 18. See Also
227231

228232
- [FFmpeg API Documentation](https://ffmpeg.org/doxygen/4.0/index.html)
229233
- [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart)

0 commit comments

Comments
 (0)