Skip to content

Commit 72fd1fe

Browse files
committed
Split up initial config_options into done via mutiple line concatenations
This allows for merging between branches that may change these options to be done with easier to resolve conflicts.
1 parent a319c0f commit 72fd1fe

File tree

1 file changed

+39
-1
lines changed

1 file changed

+39
-1
lines changed

cross_compile_ffmpeg.sh

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2419,7 +2419,45 @@ build_ffmpeg() {
24192419
init_options+=" --disable-schannel"
24202420
# Fix WinXP incompatibility by disabling Microsoft's Secure Channel, because Windows XP doesn't support TLS 1.1 and 1.2, but with GnuTLS or OpenSSL it does. XP compat!
24212421
fi
2422-
config_options="$init_options --enable-libcaca --enable-gray --enable-libtesseract --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-gnutls"
2422+
config_options="$init_options"
2423+
config_options+="--enable-libcaca"
2424+
config_options+="--enable-gray"
2425+
config_options+="--enable-libtesseract"
2426+
config_options+="--enable-fontconfig"
2427+
config_options+="--enable-gmp"
2428+
config_options+="--enable-libass"
2429+
config_options+="--enable-libbluray"
2430+
config_options+="--enable-libbs2b"
2431+
config_options+="--enable-libflite"
2432+
config_options+="--enable-libfreetype"
2433+
config_options+="--enable-libfribidi"
2434+
config_options+="--enable-libgme"
2435+
config_options+="--enable-libgsm"
2436+
config_options+="--enable-libilbc"
2437+
config_options+="--enable-libmodplug"
2438+
config_options+="--enable-libmp3lame"
2439+
config_options+="--enable-libopencore-amrnb"
2440+
config_options+="--enable-libopencore-amrwb"
2441+
config_options+="--enable-libopus"
2442+
config_options+="--enable-libsnappy"
2443+
config_options+="--enable-libsoxr"
2444+
config_options+="--enable-libspeex"
2445+
config_options+="--enable-libtheora"
2446+
config_options+="--enable-libtwolame"
2447+
config_options+="--enable-libvo-amrwbenc"
2448+
config_options+="--enable-libvorbis"
2449+
config_options+="--enable-libwebp"
2450+
config_options+="--enable-libzimg"
2451+
config_options+="--enable-libzvbi"
2452+
config_options+="--enable-libmysofa"
2453+
config_options+="--enable-libopenjpeg"
2454+
config_options+="--enable-libopenh264"
2455+
config_options+="--enable-libvmaf"
2456+
config_options+="--enable-libsrt"
2457+
config_options+="--enable-libxml2"
2458+
config_options+="--enable-opengl"
2459+
config_options+="--enable-libdav1d"
2460+
config_options+="--enable-gnutls"
24232461

24242462
if [[ "$bits_target" != "32" ]]; then
24252463
if [[ $build_svt_hevc = y ]]; then

0 commit comments

Comments
 (0)