diff --git a/ChangeLog b/ChangeLog index f0e49477a..65088f5f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,23 @@ +2012-01-12 Moritz Bunkus + + * mkvmerge: enhancement: Identification output for Matroska files: + Added the track number header field as "number" to the verbose + identification mode. + 2012-01-09 Moritz Bunkus - * mkvmerge: enhancement: Added a field - "content_encoding_algorithms" that contains a comma-separated list - of encoding algorithm IDs used for that track. For example, - "content_encoding_algorithms:3" would indicate that header removal - compression is used. + * mkvmerge: enhancement: Identification output for Matroska files: + Added a field "content_encoding_algorithms" that contains a + comma-separated list of encoding algorithm IDs used for that + track. For example, "content_encoding_algorithms:3" would indicate + that header removal compression is used. 2012-01-07 Moritz Bunkus - * mkvmerge: enhancement: Added several fields to mkvmerge's - verbose identification mode for tracks: UID, CodecID, length and - content (as a hex dump) of the codec private data. + * mkvmerge: enhancement: Identification output for Matroska files: + Added several fields to mkvmerge's verbose identification mode for + tracks: UID, CodecID, length and content (as a hex dump) of the + codec private data. * mkvmerge: bug fix: Fixed a segmentation fault in the DTS detection code. Fix for bug 698. diff --git a/src/input/r_matroska.cpp b/src/input/r_matroska.cpp index d07a1fe21..fd069b383 100644 --- a/src/input/r_matroska.cpp +++ b/src/input/r_matroska.cpp @@ -2278,6 +2278,7 @@ kax_reader_c::identify() { verbose_info.clear(); + verbose_info.push_back((boost::format("number:%1%") % track->track_number).str()); verbose_info.push_back((boost::format("uid:%1%") % track->track_uid).str()); verbose_info.push_back((boost::format("codec_id:%1%") % escape(track->codec_id)).str()); verbose_info.push_back((boost::format("codec_private_length:%1%") % track->private_size).str()); diff --git a/tests/results.txt b/tests/results.txt index 19b0c1295..21508b8fa 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -63,7 +63,7 @@ T_213mp4_broken_pixel_dimensions:4ab136f8ed75613590de7ded9d4bbb81:passed:2005091 T_214one_frame_avi:8b5003e62e885d084c555f80020f1b30:passed:20051004-192755:0.033334586 T_215X_codec_extradata_avi:3876bc3722144c16d4b1aec484d98c34-3fabc505fdd377c05ce4557b1bc13545:passed:20051004-194707:0.082329916 T_216mp4_editlists:c67d7eda9eda56e99cf4b9a85d2aa0f2:passed:20051118-191453:0.040645125 -T_217file_identification:ef3c502529537c1d3699d0e0487751c3-713a636c5dbc8b6c8da4913f8e74904d-dea3e40864ba359535ddb72fdb23eac3-d3b28b8809b46d4dc626754e7065b027-a275e9abb3cc154307663d5ca6fce615-3187bcbc4eb44d78f9eab3d4ca6ed787-d7678dc91cba91a946c22e5b96f3b3b6-3f60e3a03129d1e4610ae668459457cc-c170654ad0688c40fc9e2ceeb9ef0b9f-6b44c4e351ac48b7fdb63355c65783eb-d701319c3f77c58adfee92b1186a3993-12aa395d3bc0431c5acb81bc4407b70f-3e7956db47487933b47241fc7bc76359-52dfc8091ce64db9f8ad44aee34748ec-6b7149a5774a37d214b8085c6409aab3-15beba0108723bff77bf8d88876f8f31-72fabb6ff0194c82321db1c317b11c63-96daf75924808e093476fb1a88d1f314-434910cdf5c654f1b864d83f5816905b-3f953cbe9cedd498aff0765315876f86-e592a5d28c92ebb23fe6d7ea901ec0a9-f997737ca7eff867d33ee58af611e741:passed:20051209-180815:0.841701857 +T_217file_identification:ef3c502529537c1d3699d0e0487751c3-713a636c5dbc8b6c8da4913f8e74904d-e13cf277c965e7e08d8698ea7425ecdc-c8a83cbee658c28ed4b8b46fa2ffc9d7-a275e9abb3cc154307663d5ca6fce615-3187bcbc4eb44d78f9eab3d4ca6ed787-d7678dc91cba91a946c22e5b96f3b3b6-3f60e3a03129d1e4610ae668459457cc-c170654ad0688c40fc9e2ceeb9ef0b9f-6b44c4e351ac48b7fdb63355c65783eb-d701319c3f77c58adfee92b1186a3993-12aa395d3bc0431c5acb81bc4407b70f-3e7956db47487933b47241fc7bc76359-52dfc8091ce64db9f8ad44aee34748ec-6b7149a5774a37d214b8085c6409aab3-15beba0108723bff77bf8d88876f8f31-72fabb6ff0194c82321db1c317b11c63-96daf75924808e093476fb1a88d1f314-434910cdf5c654f1b864d83f5816905b-3f953cbe9cedd498aff0765315876f86-e592a5d28c92ebb23fe6d7ea901ec0a9-f997737ca7eff867d33ee58af611e741:passed:20051209-180815:0.841701857 T_218theora:59986cbebb1a61762c16ae591ae8c345-88d9297a7f549c68aea49c3b4abf007a:passed:20060428-105054:0.71619861 T_219srt_short_timecodes:1350b59f405cabe1107c752f009f2f2a:passed:20060926-112658:0.213195421 T_220ass_with_comments_at_start:4aad786f675e15a5efd623cb8d822cff:passed:20060926-120101:0.839985533