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

update project README
pull/1069/head
Taner Sener 7 months ago committed by GitHub
commit ea8e8ded96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      .github/workflows/android-build-scripts.yml
  2. 2
      .github/workflows/ios-build-scripts.yml
  3. 2
      .github/workflows/macos-build-scripts.yml
  4. 6
      .github/workflows/periodic-builds-apple.yml
  5. 2
      .github/workflows/tvos-build-scripts.yml
  6. 10
      README.md

@ -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' ]

@ -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

@ -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

@ -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:

@ -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

@ -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)

Loading…
Cancel
Save