fix macos build: for macos, Q_OS_UNIX is also defined

This commit is contained in:
R. Aidan Campbell 2018-07-21 14:31:37 -07:00
parent 399154f5f5
commit c816a6198c
2 changed files with 3 additions and 6 deletions

View file

@ -67,7 +67,7 @@ win32 {
macx {
SOURCES += streaming/video/ffmpeg-renderers/vt.mm
}
unix {
unix:!macx {
SOURCES += streaming/video/ffmpeg-renderers/vaapi.cpp
}

View file

@ -7,9 +7,7 @@
#ifdef __APPLE__
#include "ffmpeg-renderers/vt.h"
#endif
#ifdef Q_OS_UNIX
#elif defined Q_OS_UNIX
#include "ffmpeg-renderers/vaapi.h"
#endif
@ -73,8 +71,7 @@ bool FFmpegVideoDecoder::chooseDecoder(
case AV_HWDEVICE_TYPE_VIDEOTOOLBOX:
newRenderer = VTRendererFactory::createRenderer();
break;
#endif
#ifdef Q_OS_UNIX
#elif defined Q_OS_UNIX
case AV_HWDEVICE_TYPE_VAAPI:
newRenderer = new VAAPIRenderer();
break;