jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit bd70e73c25.

Turns out the commit was due to a miscommunication -- the commit it was
fixing actually worked fine, and this fix was unnecessary.
master
jp9000 2016-07-02 23:54:43 -07:00
parent e389ae8a75
commit f8fcba2fa2
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@ -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;