From 26c162aa9364ee489cd5545a0c745ace7f079ab9 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 24 Aug 2003 00:27:38 +0000 Subject: [PATCH] Disabled lacing by default and renamed --no-lacing to --enable-lacing. With all the proper info about the laced frames lacing is actually producing larger files than without lacing. --- ChangeLog | 4 ++++ src/mkvmerge.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1008e0b49..cdab785fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-08-24 Moritz Bunkus + * mkvmerge: Disabled lacing by default and renamed --no-lacing to + --enable-lacing. With all the proper info about the laced frames + lacing is actually producing larger files than without lacing. + * mkvmerge: Meta seek element is split into two elements. The first's located at the start of the file containing only a small number of level 1 elements. The clusters are referenced in a diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp index cdb004d4b..3e61ebd84 100644 --- a/src/mkvmerge.cpp +++ b/src/mkvmerge.cpp @@ -137,7 +137,7 @@ int max_ms_per_cluster = 2000; bool write_cues = true, cue_writing_requested = false; bool video_track_present = false; bool write_meta_seek_for_clusters = true; -bool no_lacing = false, no_linking = false; +bool no_lacing = true, no_linking = false; int64_t split_after = -1; bool split_by_time = false; int split_max_num_files = 65535; @@ -235,7 +235,7 @@ static void usage() { " --no-cues Do not write the cue data (the index).\n" " --no-clusters-in-meta-seek\n" " Do not write meta seek data for clusters.\n" - " --no-lacing Do not use lacing.\n" + " --enable-lacing Use lacing.\n" "\n File splitting and linking (still global):\n" " --split \n" " Create a new file after d bytes (KB, MB, GB)\n" @@ -1151,8 +1151,8 @@ static void parse_args(int argc, char **argv) { else if (!strcmp(argv[i], "--no-clusters-in-meta-seek")) write_meta_seek_for_clusters = false; - else if (!strcmp(argv[i], "--no-lacing")) - no_lacing = true; + else if (!strcmp(argv[i], "--enable-lacing")) + no_lacing = false; else if (!strcmp(argv[i], "--attachment-description")) { if ((i + 1) >= argc)