UI: Switch RecFormat to RecFormat2

Commit f1223ca566473bc90cf3643711db742b3d976c9c
(UI: Set fragmented MP4/MOV as default for beta/rc)
changed RecFormat to RecFormat2.
This conflicts with the use of RecFormat introduced in
d18b38e784a1e8ffef4ded32eece7bf6b7ef0589
(UI: Enable multiple audio tracks in Simple Output recording).
This fixes the issue.
An unused var is also removed.

Signed-off-by: pkv <[email protected]>

UI/window-basic-main-outputs.cpp

@@ -834,7 +834,7 @@ void SimpleOutput::UpdateRecordingAudioSettings()
 	int tracks =
 		config_get_int(main->Config(), "SimpleOutput", "RecTracks");
 	const char *recFormat =
-		config_get_string(main->Config(), "SimpleOutput", "RecFormat");
+		config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
 	const char *quality =
 		config_get_string(main->Config(), "SimpleOutput", "RecQuality");
 	bool flv = strcmp(recFormat, "flv") == 0;
@@ -1024,7 +1024,7 @@ inline void SimpleOutput::SetupOutputs()
 	int tracks =
 		config_get_int(main->Config(), "SimpleOutput", "RecTracks");
 	const char *recFormat =
-		config_get_string(main->Config(), "SimpleOutput", "RecFormat");
+		config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
 	bool flv = strcmp(recFormat, "flv") == 0;
 
 	if (usingRecordingPreset) {
@@ -1228,7 +1228,7 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
 void SimpleOutput::UpdateRecording()
 {
 	const char *recFormat =
-		config_get_string(main->Config(), "SimpleOutput", "RecFormat");
+		config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
 	bool flv = strcmp(recFormat, "flv") == 0;
 	int tracks =
 		config_get_int(main->Config(), "SimpleOutput", "RecTracks");
@@ -1308,8 +1308,6 @@ bool SimpleOutput::ConfigureRecording(bool updateReplayBuffer)
 		config_get_int(main->Config(), "SimpleOutput", "RecRBSize");
 	int tracks =
 		config_get_int(main->Config(), "SimpleOutput", "RecTracks");
-	const char *recFormat =
-		config_get_string(main->Config(), "SimpleOutput", "RecFormat");
 
 	bool is_fragmented = strcmp(format, "fmp4") == 0 ||
 			     strcmp(format, "fmov") == 0;