diff options
| author | eddyg <[email protected]> | 2009-05-06 22:58:21 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2009-05-06 22:58:21 +0000 |
| commit | e797f1b5f0a4c0388fac3dadaab836a84c7cfe77 (patch) | |
| tree | d104c243bae5f9b71a48d875d30791967c1cacf0 /libhb/sync.c | |
| parent | 608dfc094e62c0734cc22ffdcda73c3f60391924 (diff) | |
Removed double EOF for CC's (one from dvd and one from cc), fixed compiler warnings for CC.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2394 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/sync.c')
| -rw-r--r-- | libhb/sync.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libhb/sync.c b/libhb/sync.c index a0dfd6627..67093d1e6 100644 --- a/libhb/sync.c +++ b/libhb/sync.c @@ -416,17 +416,25 @@ static void SyncVideo( hb_work_object_t * w ) * * Bypass the sync fifo altogether. */ - if( sub->size == 0 || sub->start < cur->start ) + if( sub->size == 0 ) { - uint64_t duration; - duration = sub->stop - sub->start; sub = hb_fifo_get( subtitle->fifo_raw ); - sub->start = pv->next_start; - sub->stop = sub->start + duration; hb_fifo_push( subtitle->fifo_out, sub ); - } else { sub = NULL; break; + } else { + if( sub->start < cur->start ) + { + uint64_t duration; + duration = sub->stop - sub->start; + sub = hb_fifo_get( subtitle->fifo_raw ); + sub->start = pv->next_start; + sub->stop = sub->start + duration; + hb_fifo_push( subtitle->fifo_out, sub ); + } else { + sub = NULL; + break; + } } } } |