OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: fix a problem with running mingw cross compiled ghb under wine
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
work.c
diff --git
a/libhb/work.c
b/libhb/work.c
index
486b8a3
..
752839b
100644
(file)
--- 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;
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 );
}
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 )
if( !job->indepth_scan &&
subtitle->format == PICTURESUB
&& subtitle->config.dest == PASSTHRUSUB )