Skip to content

Commit 2fcc0b4

Browse files
committed
format
1 parent a70e294 commit 2fcc0b4

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、dvdnav、ff
2121

2222
- FFmpeg 7.1.1 is already in use
2323
- upgrade all libs to lastest,Improved optimizations
24-
- using macOS 14, remove bitcode support
24+
- using macOS 14,Xcode_15.4,remove bitcode support
2525

2626
[https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes#Deprecations](https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes#Deprecations)
2727

@@ -49,7 +49,7 @@ Tips:
4949
2、fsplayer is denpendent on ffmpeg and ass.
5050
3、ijkplayer is denpendent on ijkffmpeg.
5151
4、FFmpegTutorial is denpendent on fftutorial.
52-
4、when install pre-compiled lib, will containes it's denpendencies.
52+
5、when install pre-compiled lib, will containes it's denpendencies.
5353
```
5454

5555
## Download/Install Pre-compiled Libs
@@ -95,7 +95,7 @@ Once the source code repository initialization is complete, you can start the co
9595
./main.sh compile --help
9696
# As shown in the help:
9797
# -p specifies the platform
98-
# -c specifies the action (e.g., build for compilation, rebuild for recompilation)
98+
# -c specifies the action (e.g build for compilation, rebuild for recompilation)
9999
# -l specifies the libraries to compile
100100
# -a specifies the CPU architecture
101101
```
@@ -107,7 +107,7 @@ The following code demonstrates how to compile FFmpeg 7 for the iOS platform:
107107
# recommend choice (because ffmpeg7 was pre-compiled,it contained all dependencies)
108108
./main.sh install -p ios -l ffmpeg7
109109
# other choice (you must know ffmpeg7's dependent lib name)
110-
./main.sh install -p ios -l "openssl3 opus bluray dav1d dvdnav uavs3d,smb2"
110+
./main.sh install -p ios -l "openssl3 opus bluray dav1d dvdnav uavs3d smb2"
111111
# Compile FFmpeg7 for the arm64 architecture on iOS
112112
./main.sh compile -p ios -a arm64 -l ffmepg7 --skip-fmwk
113113
```
@@ -120,25 +120,25 @@ If cloning repositories from GitHub is slow, or if you need to use an internal p
120120

121121
| Lib Name | Current Version | Repository URL | Mirror Repository URL |
122122
| ---------- | --------------- | -------------------------------------------------------- | -------------------------------------------------------- |
123-
| ffmpeg7 | 7.1.1 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM = git@xx:yy/FFmpeg.git |
124-
| ffmpeg6 | 6.1.1 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM = git@xx:yy/FFmpeg.git |
125-
| ffmpeg5 | 5.1.6 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM = git@xx:yy/FFmpeg.git |
126-
| ffmpeg4 | 4.0.5 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM = git@xx:yy/FFmpeg.git |
127-
| ass | 0.17.3 | https://github.com/libass/libass.git | export GIT_ASS_UPSTREAM = git@xx:yy/libass.git |
128-
| bluray | 1.3.4 | https://code.videolan.org/videolan/libbluray.git | export GIT_BLURAY_UPSTREAM = git@xx:yy/libbluray.git |
129-
| dav1d | 1.5.1 | https://code.videolan.org/videolan/dav1d.git | export GIT_DAV1D_UPSTREAM = git@xx:yy/dav1d.git |
130-
| dvdread | 6.1.3 | https://code.videolan.org/videolan/libdvdread.git | export GIT_DVDREAD_UPSTREAM = git@xx:yy/libdvdread.git |
131-
| dvdnav | master-9831fe01 | https://code.videolan.org/videolan/libdvdnav.git | export GIT_DVDNAV_UPSTREAM = git@xx:yy/libdvdnav.git |
123+
| ffmpeg7 | 7.1.1 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git |
124+
| ffmpeg6 | 6.1.1 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git |
125+
| ffmpeg5 | 5.1.6 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git |
126+
| ffmpeg4 | 4.0.5 | https://github.com/FFmpeg/FFmpeg.git | export GIT_FFMPEG_UPSTREAM=git@xx:yy/FFmpeg.git |
127+
| ass | 0.17.3 | https://github.com/libass/libass.git | export GIT_ASS_UPSTREAM=git@xx:yy/libass.git |
128+
| bluray | 1.3.4 | https://code.videolan.org/videolan/libbluray.git | export GIT_BLURAY_UPSTREAM=git@xx:yy/libbluray.git |
129+
| dav1d | 1.5.1 | https://code.videolan.org/videolan/dav1d.git | export GIT_DAV1D_UPSTREAM=git@xx:yy/dav1d.git |
130+
| dvdread | 6.1.3 | https://code.videolan.org/videolan/libdvdread.git | export GIT_DVDREAD_UPSTREAM=git@xx:yy/libdvdread.git |
131+
| dvdnav | master-9831fe01 | https://code.videolan.org/videolan/libdvdnav.git | export GIT_DVDNAV_UPSTREAM=git@xx:yy/libdvdnav.git |
132132
| fontconfig | 2.16.0 | https://gitlab.freedesktop.org/fontconfig/fontconfig.git | export GIT_FONTCONFIG_UPSTREAM=git@xx:yy/fontconfig.git |
133-
| freetype | 2.13.3 | https://gitlab.freedesktop.org/freetype/freetype.git | export GIT_FREETYPE_UPSTREAM = git@xx:yy/freetype.git |
134-
| fribidi | 1.0.16 | https://github.com/fribidi/fribidi.git | export GIT_FRIBIDI_UPSTREAM = git@xx:yy/fribidi.git |
135-
| harfbuzz | 10.2.0 | https://github.com/harfbuzz/harfbuzz.git | export GIT_HARFBUZZ_UPSTREAM = git@xx:yy/harfbuzz.git |
136-
| openssl | 1.1.1w | https://github.com/openssl/openssl.git | export GIT_OPENSSL_UPSTREAM = git@xx:yy/openssl.git |
137-
| openssl3 | 3.5.0 | https://github.com/openssl/openssl.git | export GIT_OPENSSL_UPSTREAM = git@xx:yy/openssl.git |
138-
| opus | 1.5.2 | https://gitlab.xiph.org/xiph/opus.git | export GIT_OPUS_UPSTREAM = git@xx:yy/opus.git |
133+
| freetype | 2.13.3 | https://gitlab.freedesktop.org/freetype/freetype.git | export GIT_FREETYPE_UPSTREAM=git@xx:yy/freetype.git |
134+
| fribidi | 1.0.16 | https://github.com/fribidi/fribidi.git | export GIT_FRIBIDI_UPSTREAM=git@xx:yy/fribidi.git |
135+
| harfbuzz | 10.2.0 | https://github.com/harfbuzz/harfbuzz.git | export GIT_HARFBUZZ_UPSTREAM=git@xx:yy/harfbuzz.git |
136+
| openssl | 1.1.1w | https://github.com/openssl/openssl.git | export GIT_OPENSSL_UPSTREAM=git@xx:yy/openssl.git |
137+
| openssl3 | 3.5.0 | https://github.com/openssl/openssl.git | export GIT_OPENSSL_UPSTREAM=git@xx:yy/openssl.git |
138+
| opus | 1.5.2 | https://gitlab.xiph.org/xiph/opus.git | export GIT_OPUS_UPSTREAM=git@xx:yy/opus.git |
139139
| smb2 | 6.2 | https://github.com/sahlberg/libsmb2.git | export GIT_SMB2_UPSTREAM=git@xx:yy/libsmb2.git |
140140
| soundtouch | 2.3.3 | https://codeberg.org/soundtouch/soundtouch.git | export GIT_SOUNDTOUCH_UPSTREAM=git@xx:yy/soundtouch.git |
141-
| unibreak | 6.1 | https://github.com/adah1972/libunibreak.git | export GIT_UNIBREAK_UPSTREAM = git@xx:yy/libunibreak.git |
141+
| unibreak | 6.1 | https://github.com/adah1972/libunibreak.git | export GIT_UNIBREAK_UPSTREAM=git@xx:yy/libunibreak.git |
142142
| uavs3d | 1.2.1 | https://github.com/uavs3/uavs3d.git | export GIT_UAVS3D_UPSTREAM=git@xx:yy/UAVS3D.git |
143143
| xml2 | 2.13.6 | https://github.com/GNOME/libxml2.git | export GIT_FONTCONFIG_UPSTREAM=git@xx:yy/fontconfig.git |
144144
| yuv | stable-eb6e7bb | https://github.com/debugly/libyuv.git | export GIT_YUV_UPSTREAM=git@xx:yy/yuv.git |

0 commit comments

Comments
 (0)