Merge pull request #7042 from mavlink/uvcVideo

UVC Video Work

src/FlightDisplay/FlightDisplayViewUVC.qml

@@ -16,8 +16,9 @@ Rectangle {
     id:                 _root
     width:              parent.width
     height:             parent.height
-    anchors.centerIn:   parent
     color:              Qt.rgba(0,0,0,0.75)
+    clip:               true
+    anchors.centerIn:   parent
 
     function adjustAspectRatio()
     {

src/Settings/VideoSettings.cc

@@ -90,7 +90,7 @@ DECLARE_SETTINGSFACT_NO_FUNC(VideoSettings, videoSource)
     if (!_videoSourceFact) {
         _videoSourceFact = _createSettingsFact(videoSourceName);
         //-- Check for sources no longer available
-        if(!_nameToMetaDataMap.contains(_videoSourceFact->rawValue().toString())) {
+        if(!_videoSourceFact->enumStrings().contains(_videoSourceFact->rawValue().toString())) {
             if (_noVideo) {
                 _videoSourceFact->setRawValue(videoSourceNoVideo);
             } else {