Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvmerge: iterate over correct array when output track tags

Browse Source 
Fixes #1538.
This commit is contained in:
Moritz Bunkus 2015-12-17 20:37:17 +01:00
parent 11f6ca8c19
commit 563ca4fbc7
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2015-12-17 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: chapters were output as both "chapters" and
"track_tags" in JSON identification mode. Fixes #1538.
* mkvmerge: enhancement: added the container's internal track ID
as the "number" attribute in verbose & JSON identification modes
for several container types (QuickTime/MP4: the track ID from the

2
src/merge/generic_reader.cpp
View File

@ -453,7 +453,7 @@ generic_reader_c::display_identification_results_as_json() {
{ "num_entries", result.size },
};
for (auto const &result : m_id_results_chapters) {
for (auto const &result : m_id_results_tags) {
if (ID_RESULT_GLOBAL_TAGS_ID == result.id)
json["global_tags"] += nlohmann::json{
{ "num_entries", result.size },

2
tests/results.txt
View File

@ -357,6 +357,6 @@ T_508splitting_by_parts_with_segment_linking:existence0-true-true-true-existence
T_509rerender_track_headers_chapters_attachments:1ad646e49e231108ed8b5d1c6dce8b1c:passed:20151115-230226:0.287840782
T_510propedit_add_attachments_without_meta_seek_present:770103c238a0f502c9ec55f0599d8544:passed:20151121-101043:0.070892905
T_511propedit_ensure_seek_head_exists_at_front:20f53afd94e39f5bbf3f1091eefbe31d:passed:20151129-194025:0.152563199
T_512json_identification:dc56910afee27e5f42414fde294a262c-ok-4d5b44ce8fea381a4de100ed77ee77bc-ok-4ce52c415319a3c9ace3394b251bfa04-ok-b31447af73fb7453a6801f6817a5f904-ok-35d9a8927414617bce87deeeacb24a0b-ok-1d7e45d0520f72ac8cc40b4a31f62ce2-ok-02545e0b8bb0b6e0230894446dd9469a-ok-5105d97f6ca79db07caab7bb66f12ef4-ok-76d5c58b6fc06efcfea66e447ad8bf44-ok-4f84d928bfa74c33a5fd2f08f8e138b7-ok-8dd46981cf9e1787ea682fe03aba4d92-ok-e0fd5247650d9eee6a259b0a796cbcb0-ok-c56940a2497513380531e693ec06b76c-ok-ee1ae1f2602ebaef4e83772ab5e39804-ok-617e011e200630baff85bc674b2a1292-ok:passed:20151207-223859:6.280036064
T_512json_identification:dc56910afee27e5f42414fde294a262c+ok-4d5b44ce8fea381a4de100ed77ee77bc+ok-4ce52c415319a3c9ace3394b251bfa04+ok-b31447af73fb7453a6801f6817a5f904+ok-35d9a8927414617bce87deeeacb24a0b+ok-1d7e45d0520f72ac8cc40b4a31f62ce2+ok-7c4bfe1e467c782175892a155c9769aa+ok-2f1b1e7b1845e40b66c42c555e2214bd+ok-76d5c58b6fc06efcfea66e447ad8bf44+ok-4f84d928bfa74c33a5fd2f08f8e138b7+ok-8dd46981cf9e1787ea682fe03aba4d92+ok-e0fd5247650d9eee6a259b0a796cbcb0+ok-c56940a2497513380531e693ec06b76c+ok-ee1ae1f2602ebaef4e83772ab5e39804+ok-617e011e200630baff85bc674b2a1292+ok:passed:20151207-223859:6.280036064
T_513vp9_10bit_key_frame_detection:9eab6e85ec792dcf670873d70a87f6ea:passed:20151208-224613:0.267556245
T_514remove_track_statistics_tags_during_remux:022578a22c45c06ab23dc453df71f7c0-afe190e36be530592fe3b83fb28d3e69-a7f246fe02132a1fb9cd3d7d0f85f180:passed:20151215-134129:1.426290351

2
tests/test-512json_identification.rb
View File

@ -34,7 +34,7 @@ test "identification and validation" do
puts errors.join("\n")
end
hashes += [ output.md5, valid ? "ok" : "invalid" ]
hashes << "#{output.md5}+#{valid ? "ok" : "invalid"}"
end
hashes.join '-'