Merge branch 'dev' into own-cmake

src/lsl_output.cpp

@@ -123,8 +123,8 @@ static void lsl_output_update(void *data, obs_data_t *settings)
     const char* name = obs_data_get_string(settings,"name");
     out_data->id_name = (char *) id_name;
     out_data->name = (char *) name;
-    out_data->record = obs_data_get_bool(settings,"stream");
-	out_data->stream = obs_data_get_bool(settings, "record");
+    out_data->record = obs_data_get_bool(settings,"record");
+	out_data->stream = obs_data_get_bool(settings, "stream");
     out_data->framerate = obs_data_get_int(settings, "framerate");
 
 }