Skip to content

Commit 7565ec6

Browse files
committed
compatiable with ffmpeg5 no patch
1 parent 1466d9b commit 7565ec6

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

configs/ffconfig/auto-detect-third-libs.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ gt_or_equal() {
107107
return 0
108108
}
109109

110+
has_feature() {
111+
local feature=$1
112+
$MR_BUILD_SOURCE/configure --help | grep -q -- "$feature" && enable_feature=1 || enable_feature=0
113+
echo $enable_feature
114+
return 0
115+
}
116+
110117
echo "----------------------"
111118
# use pkg-config fix ff4.0--ijk0.8.8--20210426--001 use openssl 1_1_1m occur can't find openssl error.
112119

@@ -204,8 +211,8 @@ if [[ $result ]]; then
204211
fi
205212
echo "----------------------"
206213
else
207-
result=$(gt_or_equal "$GIT_REPO_VERSION" "5")
208-
if [[ $result ]]; then
214+
dvd_feature=$(has_feature "libdvdread")
215+
if [[ $dvd_feature ]]; then
209216
pkg-config --libs dvdread --silence-errors >/dev/null && enable_dvdread=1
210217
if [[ $enable_dvdread ]];then
211218
echo "[✅] --enable-libdvdread : $(pkg-config --modversion dvdread)"
@@ -247,8 +254,9 @@ fi
247254

248255
echo "----------------------"
249256

250-
enable_webp=
251-
if [[ $MR_PLAT != 'android' ]];then
257+
result=$(gt_or_equal "$GIT_REPO_VERSION" "7")
258+
if [[ $result && $MR_PLAT != 'android' ]]; then
259+
enable_webp=
252260
pkg-config --libs libwebp --silence-errors >/dev/null && enable_webp=1
253261
if [[ $enable_webp ]];then
254262
echo "[✅] --enable-libwebp --enable-decoder=webp : $(pkg-config --modversion libwebp)"

0 commit comments

Comments
 (0)