summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-09-04 17:25:43 +0000
committerjstebbins <[email protected]>2014-09-04 17:25:43 +0000
commit3568f2a8c9cb0928a0b58f7c0d95bceb0254af6b (patch)
tree1c83f992741cf00476dd42ba594947c6c3969040 /libhb
parent58a5283b46d0d80644cb6e0ad9f7f39a7740da27 (diff)
libhb: fix setting thread_count for libav encoding
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6389 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/encavcodec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 127e1249d..271d6f3d0 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -99,8 +99,6 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
// Set things in context that we will allow the user to
// override with advanced settings.
- context->thread_count = ( hb_get_cpu_count() * 3 / 2 );
-
if( job->pass == 2 )
{
hb_interjob_t * interjob = hb_interjob_get( job->h );
@@ -272,7 +270,7 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
}
}
- if( hb_avcodec_open( context, codec, &av_opts, 0 ) )
+ if (hb_avcodec_open(context, codec, &av_opts, HB_FFMPEG_THREADS_AUTO))
{
hb_log( "encavcodecInit: avcodec_open failed" );
}