ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7833 from orbea/ffmpeg 

qb: Only print threading warning when ffmpeg is not disabled.
This commit is contained in:
Twinaphex 2018-12-28 21:09:15 +01:00 committed by GitHub
parent 055f880775 1e513598d3
commit 671b49afcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qb/config.libs.sh
View File

@ -413,7 +413,12 @@ if [ "$HAVE_MPV" != 'no' ]; then
check_pkgconf MPV libmpv check_pkgconf MPV libmpv
fi 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 AVCODEC libavcodec 54
check_pkgconf AVFORMAT libavformat 54 check_pkgconf AVFORMAT libavformat 54
check_pkgconf AVDEVICE libavdevice 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.' die : 'Notice: FFmpeg built-in support disabled due to missing or unsuitable packages.'
fi fi
else else
die : 'Notice: Not building with threading support. Will skip FFmpeg.'
HAVE_FFMPEG='no' HAVE_FFMPEG='no'
fi fi