优化ios&android编译选项

tencentyun · Jul 13, 2022 · eebf033 · eebf033
1 parent 526ef83
commit eebf033
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/script/build_ijk_ios.sh b/.github/script/build_ijk_ios.sh
@@ -9,6 +9,8 @@ currtag=$(git describe --tags `git rev-list --tags --max-count=1`)
 currbra=$rb
 echo 000---$currtag
 
+sed -i "" "s/.*disable-videotoolbox.*/export COMMON_FF_CFG_FLAGS=\"\$\COMMON_FF_CFG_FLAGS --enable-videotoolbox\"/g" ./config/module-lite.sh
+
 ./init-ios.sh
 ./init-ios-openssl.sh
 

diff --git a/config/module-lite.sh b/config/module-lite.sh
@@ -60,7 +60,6 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-dxva2"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vaapi"
 #export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vda"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vdpau"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-videotoolbox"
 
 # Individual component options:
 # export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-everything"
@@ -166,7 +165,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-filters"
 # External library support:
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-iconv"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-audiotoolbox"
-# export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
 
 # ...