From 1970e8005a31098e3b261fc754fbcd7a5df5c7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Sun, 19 Apr 2015 10:46:42 -0300 Subject: [PATCH] (qb) Fix ffmpeg detection --- qb/config.libs.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index dcd5745691..3f95252ea7 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -258,7 +258,12 @@ if [ "$HAVE_THREADS" != 'no' ]; then check_pkgconf AVUTIL libavutil 51 check_pkgconf SWSCALE libswscale 2.1 check_header AV_CHANNEL_LAYOUT libavutil/channel_layout.h - ( [ "$HAVE_FFMPEG" = 'auto' ] && ( [ "$HAVE_AVCODEC" = 'no' ] || [ "$HAVE_AVFORMAT" = 'no' ] || [ "$HAVE_AVUTIL" = 'no' ] || [ "$HAVE_SWSCALE" = 'no' ] ) && HAVE_FFMPEG='no' ) || HAVE_FFMPEG='yes' + + HAVE_FFMPEG='yes' + if [ "$HAVE_AVCODEC" = 'no' ] || [ "$HAVE_AVFORMAT" = 'no' ] || [ "$HAVE_AVUTIL" = 'no' ] || [ "$HAVE_SWSCALE" = 'no' ]; then + HAVE_FFMPEG='no' + echo "Notice: FFmpeg recording disabled due to missing or unsuitable packages." + fi fi else echo "Notice: Not building with threading support. Will skip FFmpeg."