Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed warnings linked to the "--dont-link" renaming.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-02-03 14:50:00 +00:00
parent 31b867012f
commit 421e942043
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mkvmerge.cpp
View File

@ -1828,14 +1828,15 @@ static void parse_args(int argc, char **argv) {
mxexit(); mxexit();
} }
if (no_linking) { if (no_linking &&
if ((seguid_link_previous != NULL) || (seguid_link_next != NULL)) ((seguid_link_previous != NULL) || (seguid_link_next != NULL))) {
mxerror("'--dont-link' cannot be used together with " mxwarn("'--link' must be used if '--link-to-previous' or "
"'--link-to-previous' or '--link-to-next'.\n"); "'--link-to-next' are used as well. Turning it on.\n");
no_linking = false;
if (split_after <= 0)
mxwarn("'--dont-link' is only useful in combination with '--split'.\n");
} }
if ((split_after <= 0) && !no_linking)
mxwarn("'--link', '--link-to-previous' and '--link-to-next' are "
"only useful in combination with '--split'.\n");
for (i = 0; i < attachments.size(); i++) { for (i = 0; i < attachments.size(); i++) {
attachment_sizes_first += attachments[i]->size; attachment_sizes_first += attachments[i]->size;