From 9b88e24d71622f3672bc9bf727e24cd0e8f0c742 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Tue, 7 Mar 2023 16:06:33 +0100 Subject: Enable network support for FFmpeg This patch configures FFmpeg with network support. This enables QtMM to handle network source such as HTTP, HTTPS, or RTSP. Details: - on macOS and windows ffmpeg uses native security backend so we don't include openssl to the build. Additional patch for linking with the security backend is in QtMM commit under the same task. - on linux we add openssl; for all CI linux platforms libssl-dev is installed. Task-number: QTBUG-110708 Pick-to: 6.5 Change-Id: I80a7dfda702c4d554df3a7380aac642890a28b94 Reviewed-by: Lars Knoll --- coin/provisioning/common/shared/ffmpeg_config_options.txt | 2 +- coin/provisioning/common/unix/install-ffmpeg.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/shared/ffmpeg_config_options.txt b/coin/provisioning/common/shared/ffmpeg_config_options.txt index ccfed1ee..c125998c 100644 --- a/coin/provisioning/common/shared/ffmpeg_config_options.txt +++ b/coin/provisioning/common/shared/ffmpeg_config_options.txt @@ -1 +1 @@ ---disable-programs --disable-doc --disable-debug --disable-network --disable-lzma --enable-pic \ No newline at end of file +--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 0e7fb00e..ad5fda4d 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -143,6 +143,7 @@ build_ffmpeg_android() { } if [ "$os" == "linux" ]; then + ffmpeg_config_options="$ffmpeg_config_options --enable-openssl" build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" -- cgit v1.2.3