summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-11-14 01:56:07 +0000
committerjstebbins <[email protected]>2010-11-14 01:56:07 +0000
commite07276247a2c7f0e0f300b2cecfe0f47d966e26e (patch)
tree73e2ca8493d7f7e0ff929df6246a56b784af1119 /libhb
parentf15c4c370252a313d0ed2114e5d8f9ea52a18ede (diff)
fix a problem with search progress indicator and p-to-p
using incorrect timestamp gave bad progress percent git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3678 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/sync.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libhb/sync.c b/libhb/sync.c
index 34ce46037..cfc0c2a20 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -338,7 +338,7 @@ int syncVideoWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
hb_cond_broadcast( pv->common->next_frame );
hb_unlock( pv->common->mutex );
- UpdateSearchState( w, next->start );
+ UpdateSearchState( w, next_start );
hb_buffer_close( &next );
return HB_WORK_OK;
@@ -610,13 +610,14 @@ int syncVideoWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
* so just push them through for rendering.
*
*/
- if( sub_start < start )
+ if( sub_start <= start )
{
sub = hb_fifo_get( subtitle->fifo_raw );
sub->start = sub_start;
sub->stop = sub_stop;
hb_fifo_push( subtitle->fifo_out, sub );
} else {
+ // sub too early. Leave it in the fifo.
sub = NULL;
break;
}