Просмотр исходного кода

Revert "obs-ffmpeg: Use core count for output threads by default"

This reverts commit bd70e73c25b0ec18373c9d2270ebe386c304076c.

Turns out the commit was due to a miscommunication -- the commit it was
fixing actually worked fine, and this fix was unnecessary.
jp9000 9 лет назад
Родитель
Сommit
f8fcba2fa2
1 измененных файлов с 1 добавлено и 6 удалено
  1. 1 6
      plugins/obs-ffmpeg/obs-ffmpeg-output.c

+ 1 - 6
plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -242,12 +242,7 @@ static bool create_video_stream(struct ffmpeg_data *data)
 	context->pix_fmt        = closest_format;
 	context->colorspace     = data->config.color_space;
 	context->color_range    = data->config.color_range;
-
-	if (context->thread_count == 1) {
-		int caps = context->codec->capabilities;
-		context->thread_count = !!(caps & AV_CODEC_CAP_AUTO_THREADS) ?
-			0 : av_cpu_count();
-	}
+	context->thread_count   = 0;
 
 	data->video->time_base = context->time_base;