Merge pull request mavlink#5255 from dogmaphobic/videoStreaming

Exclude method when not building with video streaming support.
ianuoui · Jun 6, 2017 · 6e980ad · 6e980ad
2 parents fb5e524 + e0b57ec
commit 6e980ad
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/VideoStreaming/VideoReceiver.cc b/src/VideoStreaming/VideoReceiver.cc
@@ -27,6 +27,8 @@
 
 QGC_LOGGING_CATEGORY(VideoReceiverLog, "VideoReceiverLog")
 
+#if defined(QGC_GST_STREAMING)
+
 static const char* kVideoExtensions[] =
 {
     "mkv",
@@ -43,6 +45,9 @@ static const char* kVideoMuxes[] =
 
 #define NUM_MUXES (sizeof(kVideoMuxes) / sizeof(char*))
 
+#endif
+
+
 VideoReceiver::VideoReceiver(QObject* parent)
     : QObject(parent)
 #if defined(QGC_GST_STREAMING)
@@ -461,6 +466,7 @@ gboolean VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer dat
 }
 #endif
 
+#if defined(QGC_GST_STREAMING)
 void VideoReceiver::_cleanupOldVideos()
 {
     QString savePath = qgcApp()->toolbox()->settingsManager()->videoSettings()->videoSavePath()->rawValue().toString();
@@ -493,6 +499,7 @@ void VideoReceiver::_cleanupOldVideos()
         }
     }
 }
+#endif
 
 // When we finish our pipeline will look like this:
 //