X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fwork.c;h=752839bce0b7259dee24817f7462cb51ff60e630;hb=ed5a81836cbf7880f751d04a00558cd35a401600;hp=486b8a3052ef2e6fa8f97931e8a847a7edc6d52a;hpb=8fecfabb5a3859af102a1d02f4a97f4c62931447;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/work.c b/libhb/work.c index 486b8a30..752839bc 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -362,7 +362,8 @@ void correct_framerate( hb_job_t * job ) interjob->vrate_base = job->vrate_base; real_frames = interjob->frame_count - interjob->render_dropped; - job->vrate = job->vrate_base * ( real_frames / ( interjob->total_time / 90000 ) ); + + job->vrate = job->vrate_base * ( (double)real_frames * 90000 / interjob->total_time ); } @@ -589,6 +590,15 @@ static void do_job( hb_job_t * job, int cpu_count ) hb_list_add( job->list_work, w ); } + if( !job->indepth_scan && subtitle->source == SRTSUB ) + { + w = hb_get_work( WORK_DECSRTSUB ); + w->fifo_in = subtitle->fifo_in; + w->fifo_out = subtitle->fifo_raw; + w->subtitle = subtitle; + hb_list_add( job->list_work, w ); + } + if( !job->indepth_scan && subtitle->format == PICTURESUB && subtitle->config.dest == PASSTHRUSUB )