From f8fcba2fa2f07a124f1a2f9b6aa519230dd98a26 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 2 Jul 2016 23:54:43 -0700 Subject: [PATCH] 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. --- plugins/obs-ffmpeg/obs-ffmpeg-output.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c index 208d3c20a..f08bd7c80 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c +++ b/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;