Fixing crash on startup

Author: aleksandr-voitenko

libobs/media-io/video-io.c

@@ -582,34 +582,6 @@ void video_output_stop(video_t *video)
 	}
 }
 
-// TODO: OLD version
-/*
-void video_output_stop(video_t *video)
-{
-	void *thread_ret;
-
-	if (!video)
-		return;
-
-	video = get_root(video);
-
-	if (!video->stop) {
-		video->stop = true;
-		os_sem_post(video->update_semaphore);
-		pthread_join(video->thread, &thread_ret);
-
-		if (video == obs->data.main_canvas->mix->video) {
-			// The graphics thread must end before mutexes are destroyed
-			if (obs->video.thread_initialized) {
-				pthread_join(obs->video.video_thread,
-					     &thread_ret);
-				obs->video.thread_initialized = false;
-			}
-		}
-	}
-}
-*/
-
 bool video_output_stopped(video_t *video)
 {
 	if (!video)

libobs/obs.c

@@ -797,36 +797,13 @@ static int obs_init_video()
 	return OBS_VIDEO_SUCCESS;
 }
 
-// TODO: remove this
-/*
 static void stop_video(void)
 {
-	//if (obs->data.main_canvas->mix) {
-	//	video_output_stop(obs->data.main_canvas->mix->video);
-	//}
-
 	pthread_mutex_lock(&obs->video.mixes_mutex);
 	for (size_t i = 0, num = obs->video.mixes.num; i < num; i++)
 		video_output_stop(obs->video.mixes.array[i]->video);
 	pthread_mutex_unlock(&obs->video.mixes_mutex);
 }
-*/
-
-static void stop_video(void)
-{
-	pthread_mutex_lock(&obs->video.mixes_mutex);
-	for (size_t i = 0, num = obs->video.mixes.num; i < num; i++)
-		video_output_stop(obs->video.mixes.array[i]->video);
-	pthread_mutex_unlock(&obs->video.mixes_mutex);
-
-	struct obs_core_video *video = &obs->video;
-	void *thread_retval;
-
-	if (video->thread_initialized) {
-		pthread_join(video->video_thread, &thread_retval);
-		video->thread_initialized = false;
-	}
-}
 
 static void obs_free_render_textures(struct obs_core_video_mix *video)
 {
@@ -915,7 +892,10 @@ static void obs_free_video(bool full_clean)
 
 	pthread_mutex_lock(&obs->video.mixes_mutex);
 	size_t num_views = 0;
-	for (size_t i = 0; i < obs->video.mixes.num; i++) {
+	// 0 value of "i" is reserved for the main canvas, which is created first and
+	// remains present throughout the lifetime of the application.
+	// As this canvas is unused, we can safely skip it.
+	for (size_t i = 1; i < obs->video.mixes.num; i++) {
 		struct obs_core_video_mix *video = obs->video.mixes.array[i];
 		if (video && video->view)
 			num_views++;