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

mkvmerge: don't abort if no tracks will be muxed

Browse Source
This commit is contained in:
Moritz Bunkus 2018-08-21 14:26:04 +02:00
parent 964042cf30
commit c0cec671ec
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -11,6 +11,9 @@
`--generate-chapters-name-template` is empty, no names (`ChapterDisplay`
master elements with `ChapterString`/`ChapterLanguage` children) will be
generated for the chapter atoms. Part of the implementation of #2275.
* mkvmerge: mkvmerge will no longer abort with an error message if no audio,
video and subtitle tracks should be multiplexed. This allows copying of
chapters from non-chapter source files (e.g. Matroska or MP4 files).
## Bug fixes

3
src/merge/mkvmerge.cpp
View File

@ -3103,9 +3103,6 @@ main(int argc,
if (!g_identifying) {
create_packetizers();
if (g_packetizers.empty() && !g_files.empty())
mxerror(Y("No streams to output were found. Aborting.\n"));
check_track_id_validity();
create_append_mappings_for_playlists();
check_append_mapping();

2
tests/results.txt
View File

@ -294,7 +294,7 @@ T_445teletext_subs_missing_second_line:89313de5f917c4168b8bc6ca06843ee5:passed:2
T_446mkvinfo_output:556c05257634151205dce15c1f6bf8b5-9b9e2ab146ddc67ca8a49e24f32076aa-087009adbdb3c95ab7cc744991aa3fb0-8a7f452083781857dfc3dcd3656b5679-aa1faca6831b18e05f2b49ac37293c4b-d094b2ab02d07703bc249a427633c698-5275582393d8afcb8357213b866ab594-7639702f60604d61b3cf74429fb4578d-cb75de00d1c1d271a46ad1677a503a79-e303caf638c16fe29be869bbd471510c-2809a9d622454f41e278d3d39498b889-6319a624cd4c931b77b1b00ddd86d36a-bf0548bedcd8f0da3ec7b87e91dc0b5e-3afc38c26a3b128aa9fa82367d700604-7ea1de28c9ee55f519ec0f347214026b-57fc8fa08ba41f107cfe78a1395ed0ac-457d18b25b2d8084dbdf7597b579f2d3-a9923b8cfeed255285385b188ab35506-5c1a518f89d13bd89f7f3dbc4c92604e-a5576b60abc82db8c8bd1a60fabbac2a-0c04051ff82e590d488f920ac9da1ed5-e07d256f2ec4f8b84d91b802c48a4db2-e6145855a76d9b541f7b2ac149fa9f20-2ed395387b6121c9b62b7d4b1923545f:passed:20141216-165433:1.564089101
T_447mkvinfo_rounded_timecodes:409a5ad59ec67427b7983822a63ff0b7-90c50241a6ae5f1a9501b0a2f547893b-49e54c693c4b697758b1fa2d3b09ee56:passed:20141216-172642:1.712081143
T_448mpeg_ts_with_hevc:9c38022a0e4bd7b274bf9a7fce4e9fc8:passed:20141216-181650:1.133097273
T_449segfaults_assertions:error-error-ok-2684a2b671068c517bafd3a2cfb2aaca-844bf63953a1f092ccc04de6ad1d59d1-2cb3ca6660beb8cda381ab171c570ee9-error-error-ok-74082d0c0a8dec7982380cf39891a782-8c3b7c54ad1ad9b18146845f77d1a3e4-2684a2b671068c517bafd3a2cfb2aaca-2684a2b671068c517bafd3a2cfb2aaca-0fcbd3964d934f3e6dbc194aabbca3ae-68015c77e684e0bc2d45361759a5de65-0fcbd3964d934f3e6dbc194aabbca3ae:passed:20141219-195127:0.830949441
T_449segfaults_assertions:error-2bacc50e6e28fb2a92d2abf2583405f5-ok-2684a2b671068c517bafd3a2cfb2aaca-844bf63953a1f092ccc04de6ad1d59d1-2cb3ca6660beb8cda381ab171c570ee9-error-error-ok-74082d0c0a8dec7982380cf39891a782-8c3b7c54ad1ad9b18146845f77d1a3e4-2684a2b671068c517bafd3a2cfb2aaca-2684a2b671068c517bafd3a2cfb2aaca-0fcbd3964d934f3e6dbc194aabbca3ae-68015c77e684e0bc2d45361759a5de65-0fcbd3964d934f3e6dbc194aabbca3ae:passed:20141219-195127:0.830949441
T_450aac_loas_latm_in_mpeg_ts:04b18b527038f06a31d80b00a9f13026:passed:20141229-210738:0.515183095
T_451aac_loas_latm_raw:adb44c882e5b21d8b25ddf08cb682bbc:passed:20141230-155351:0.589778873
T_452mkvinfo_track_statistics_frame_order:2d51f5fb8b45d7e17dc27c15777aca23-d99eb49c2458e0ed583c11033d838eaf:passed:20141230-182428:1.579605124

2
tests/test-449segfaults_assertions.rb
View File

@ -6,7 +6,7 @@ describe "mkvmerge & mkvinfo / segfaults and assertions"
dir = "data/segfaults-assertions"
test_merge "#{dir}/1089-1.mkv", :exit_code => :error
test_merge "#{dir}/1089-2.mkv", :exit_code => :error
test_merge "#{dir}/1089-2.mkv", :exit_code => :warning
test_merge "#{dir}/1089-3.mkv", :result_type => :exit_code
test_info "#{dir}/1089-1.mkv", :args => "-v -v", :exit_code => :error