diff options
author | Rodeo <[email protected]> | 2012-05-09 12:32:10 +0000 |
---|---|---|
committer | Rodeo <[email protected]> | 2012-05-09 12:32:10 +0000 |
commit | 8386d7f382f5467667025c2bca2667fa83373f5f (patch) | |
tree | 4918cb7930edf6ba72742a7f15b7b9a7d5d832c5 | |
parent | 284e8aeba3178324c147426c4fcf8695c6844166 (diff) |
decavcodec: merge double if to a single statement.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4656 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r-- | libhb/decavcodec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 45239a29c..fca6c2f45 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -1003,13 +1003,10 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job ) pv->title = w->title; pv->list = hb_list_init(); - if( pv->job && pv->job->title ) + if( pv->job && pv->job->title && !pv->job->title->has_resolution_change && + w->codec_param != CODEC_ID_PRORES ) { - if( !pv->job->title->has_resolution_change && - w->codec_param != CODEC_ID_PRORES ) - { - pv->threads = HB_FFMPEG_THREADS_AUTO; - } + pv->threads = HB_FFMPEG_THREADS_AUTO; } if ( pv->title->opaque_priv ) { |