From 1e513598d33da0df8b088417fb3349ef4090e580 Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 28 Dec 2018 11:51:22 -0800 Subject: [PATCH] qb: Only print threading warning when ffmpeg is not disabled. --- qb/config.libs.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 9ba639ec91..6dbe6f41ef 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -413,7 +413,12 @@ if [ "$HAVE_MPV" != 'no' ]; then check_pkgconf MPV libmpv fi -if [ "$HAVE_THREADS" != 'no' ] && [ "$HAVE_FFMPEG" != 'no' ]; then +if [ "$HAVE_THREADS" = 'no' ] && [ "$HAVE_FFMPEG" != 'no' ]; then + HAVE_FFMPEG='no' + die : 'Notice: Threads are not available, FFmpeg will also be disabled.' +fi + +if [ "$HAVE_FFMPEG" != 'no' ]; then check_pkgconf AVCODEC libavcodec 54 check_pkgconf AVFORMAT libavformat 54 check_pkgconf AVDEVICE libavdevice @@ -438,7 +443,6 @@ if [ "$HAVE_THREADS" != 'no' ] && [ "$HAVE_FFMPEG" != 'no' ]; then die : 'Notice: FFmpeg built-in support disabled due to missing or unsuitable packages.' fi else - die : 'Notice: Not building with threading support. Will skip FFmpeg.' HAVE_FFMPEG='no' fi