Merge branch 'master' into multichannel

daemon/src/sip/sdp.cpp

@@ -792,6 +792,8 @@ bool Sdp::getOutgoingVideoSettings(map<string, string> &args) const
         }
         return true;
     }
+#else
+    (void) args;
 #endif
     return false;
 }