summaryrefslogtreecommitdiffstats
path: root/libhb/muxmkv.c
diff options
context:
space:
mode:
authorvan <[email protected]>2008-04-04 16:49:33 +0000
committervan <[email protected]>2008-04-04 16:49:33 +0000
commit7bde7810e9f4a32aae494a151a3ec2577b201db6 (patch)
tree130ea103845172eb247b3ed01219288324221ab0 /libhb/muxmkv.c
parent8f7e4cf3d5a6a8fdd5557c1d5f54083ba942c9aa (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/muxmkv.c')
-rw-r--r--libhb/muxmkv.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 76fc48b6f..c90f73ea7 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -265,7 +265,12 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
/* Make sure we're not writing a chapter that has 0 length */
if (mux_data->prev_chapter_tc != timecode)
{
- chapter_data = hb_list_item( title->list_chapter, mux_data->current_chapter++ );
+ if ( buf->new_chap )
+ {
+ mux_data->current_chapter = buf->new_chap - 2;
+ }
+ chapter_data = hb_list_item( title->list_chapter,
+ mux_data->current_chapter++ );
tmp_buffer[0] = '\0';
if( chapter_data != NULL )