diff options
author | van <[email protected]> | 2008-04-04 16:49:33 +0000 |
---|---|---|
committer | van <[email protected]> | 2008-04-04 16:49:33 +0000 |
commit | 7bde7810e9f4a32aae494a151a3ec2577b201db6 (patch) | |
tree | 130ea103845172eb247b3ed01219288324221ab0 /libhb/dvd.c | |
parent | 8f7e4cf3d5a6a8fdd5557c1d5f54083ba942c9aa (diff) |
Minor chapter cleanups.
- put chapter number in buf rather than a 'new chapter' flag.
- use that chapter number to index chapter text in muxers so a dropped chapter doesn't make all subsequent chapter labeling wrong.
- get rid of most of the chapter logging & just output one line giving the chapter text, number, frame & time.
- fix a bug in sync that could cause chapter marks to be lost.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1377 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/dvd.c')
-rw-r--r-- | libhb/dvd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libhb/dvd.c b/libhb/dvd.c index 3c78e2cbd..cca1e8003 100644 --- a/libhb/dvd.c +++ b/libhb/dvd.c @@ -962,7 +962,7 @@ int hb_dvd_chapter( hb_dvd_t * d ) /*********************************************************************** * hb_dvd_is_break *********************************************************************** - * Returns 1 if the current block is a new chapter start + * Returns chapter number if the current block is a new chapter start **********************************************************************/ int hb_dvd_is_break( hb_dvd_t * d ) { @@ -988,8 +988,7 @@ int hb_dvd_is_break( hb_dvd_t * d ) // This must not match against the start cell. if( pgc->cell_playback[cell].first_sector == d->block && cell != d->cell_start ) { - hb_log("dvd: Chapter Break Cell Found"); - return 1; + return i + 1; } } |