From c816a6198cf6eb053b9d14e11aaef5b1864061bb Mon Sep 17 00:00:00 2001
From: "R. Aidan Campbell" <aidan.campbell@gmail.com>
Date: Sat, 21 Jul 2018 14:31:37 -0700
Subject: [PATCH] fix macos build: for macos, Q_OS_UNIX is also defined

---
 app/app.pro                    | 2 +-
 app/streaming/video/ffmpeg.cpp | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/app.pro b/app/app.pro
index b81a6194..7f0dcebb 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -67,7 +67,7 @@ win32 {
 macx {
     SOURCES += streaming/video/ffmpeg-renderers/vt.mm
 }
-unix {
+unix:!macx {
     SOURCES += streaming/video/ffmpeg-renderers/vaapi.cpp
 }
 
diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp
index dd3d2f60..ec044085 100644
--- a/app/streaming/video/ffmpeg.cpp
+++ b/app/streaming/video/ffmpeg.cpp
@@ -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;