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

Cues rendering: reset num of processed cue entries when creating a new file

Browse Source
This commit is contained in:
Moritz Bunkus 2013-04-15 22:41:53 +02:00
parent d98aaaae4f
commit 3cb1ed9e65
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-15 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: If splitting had been active then the
elements "cue duration" and "cue relative position" were only
written to the first output file.
2013-04-14 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: The "CTS offset" field of FLV files with

1
src/merge/cluster_helper.cpp
View File

@ -206,6 +206,7 @@ cluster_helper_c::split(packet_cptr &packet) {
m_bytes_in_file = 0;
m_first_timecode_in_file = -1;
m_max_timecode_in_file = -1;
m_num_cue_points_postprocessed = 0;
}
m_first_timecode_in_part = -1;

20
tests/results.txt
View File

@ -11,12 +11,12 @@ T_010realvideo_4:444f0301eeb162fe8a3e70127ca43a87:passed:20040825-175700:0.14236
T_011srt:b36c504da68f0dda37e5265865c5d981:passed:20040825-175700:0.046294857
T_012ssa:a02fdf7fa32920a1c97490b7a9599451:passed:20040825-175700:0.041814335
T_013vobsubs:00d86c334a0ef38eab71219ba26643c1:passed:20040825-175700:0.053154297
T_014splitting_by_size:46c817fcdb86ecc4c1eee70ef293d98f-3664129ba463f8c3323e5e31e3a80149:passed:20040825-175700:0.169182788
T_015splitting_by_time:b0a767f0e11ac4a6813eede67f6ce3a9-03b8ece0d04aa84b188d8cee1fea5405:passed:20040825-175700:0.165397941
T_014splitting_by_size:46c817fcdb86ecc4c1eee70ef293d98f-0e11ecdef89db649d4464f98516a1d61:passed:20040825-175700:0.169182788
T_015splitting_by_time:b0a767f0e11ac4a6813eede67f6ce3a9-d39446e4ebcb18b97ad77ee01c214835:passed:20040825-175700:0.165397941
T_016cuesheet:f8bd7126383b2df3bfb783e81a2ba765:passed:20040825-175700:0.036974257
T_017chapters:b504a46400efe3e4a58a2401d301672e-b1fb0a63a9972771d9a290b44ff66862:passed:20040825-175700:0.099163922
T_018attachments:6288c8eb10a83366a8517d0f5c2c7ced-c62d60e2c4983e6700dba8eb2ef2d834:passed:20040825-175700:0.060948963
T_019attachments2:e7efb19605cd6245cb3267534b7ac1e0-596e0bc106cf2a245b67868c4606549b-e7efb19605cd6245cb3267534b7ac1e0-0331f463185abe280e94752744c3307c:passed:20040825-175700:0.294458921
T_019attachments2:e7efb19605cd6245cb3267534b7ac1e0-dce1928b7973a569695c58fe893ce3ea-e7efb19605cd6245cb3267534b7ac1e0-c737a1fa52069e483a38b82dab8f0123:passed:20040825-175700:0.294458921
T_020languages:5bf498141a49b70e2d068d537457633a:passed:20040825-234208:0.526580832
T_021aspect_ratio:e9f4ef96822f2d47e93564bea2cf3534-5bba962cbfc541016b20125876128216:passed:20040825-234244:0.176283735
T_022display_dimensions:7105a719df9abbe466d0cb4fa2a537b3:passed:20040825-234339:0.100695621
@ -54,9 +54,9 @@ T_204wavpack_without_correctiondata:c087ecfc4fb2b4d33200896b9acb6218:passed:2005
T_205X_cuesheets:3b00b00c7d185137e30d7e95e3123d33-b3bb67d316e20da12926d5c1d628f6e5:passed:20050210-211853:0.220321306
T_206X_vobsub:93c40bd212b1165b14b03d00148fecab-f0b88ab55ffda1f9cc447a784829bcba-2c2cb8dd42f5c15e64bc0f62ba2234b4-39e6f66ff3e0287735c4a577487de878-00d86c334a0ef38eab71219ba26643c1:passed:20050211-231728:0.108832319
T_207segmentinfo:ef6cf2e7bc4a99293ad9f6882bcff225:passed:20050211-234856:0.136609742
T_208cat_and_splitting:46c817fcdb86ecc4c1eee70ef293d98f-6354e4bf9a8138c6f592e0267159e342:passed:20050306-152640:0.284716989
T_208cat_and_splitting:46c817fcdb86ecc4c1eee70ef293d98f-045db33223adc5c4924ec0da7ac619d3:passed:20050306-152640:0.284716989
T_209ac3misdeetected_as_mpeges:eb0d17e341d62b5bd49183829fe32ab9:passed:20050315-092851:0.126988029
T_210splitting_and_chapters:eb82510724805a1e30b0548b9e580a0e-7af71a8b648d6991505327512addaa12-6947c5d59e4cb138c1d9391f5ca7feba-dd0d57ad49711ce83b5c4a0ae4258469:passed:20050406-165104:0.330168467
T_210splitting_and_chapters:eb82510724805a1e30b0548b9e580a0e-590453db7d7ac64e489621bba6dea25b-6947c5d59e4cb138c1d9391f5ca7feba-5f7332f6cf56ca884587e09ab4fc61f8:passed:20050406-165104:0.330168467
T_211bug_segfault_reading_mp4:a1dc83e59335d5b80873f5ea0e62ae1c:passed:20050728-083402:0.139717571
T_212ssa_attachments:d311eafb6766715497146bb75b2ed85c-9a5a5ed80808c9d448ca5b44b640d8aa-c9a562c38a809df96ba6bd78220bb930-6ee73fb6f296ec5a9d9322c8ec556bc3-57c15575df6f4f6e28c028df43d16caa:passed:20050824-131320:0.97327624
T_213mp4_broken_pixel_dimensions:57aa1d89ca338b03e1a3afd39f20a5af:passed:20050919-094831:0.167783191
@ -93,7 +93,7 @@ T_243avi_with_audio_garbage:40458cd68e7c988c4b612ac3bc93546d:passed:20080913-185
T_244iconv_missing_character:87ada016ba183506a3ef8c9c198e5bbe:passed:20081004-213713:0.262006208
T_245srt_timecode_formats:db711245f3231dece61fb4fd1cf869f7-db711245f3231dece61fb4fd1cf869f7:passed:20081202-141604:0.255023139
T_246theora_pixel_aspect_ratio:2ba0c9f0c1f9fecf3facfda6ada6a772:passed:20081205-174857:0.061985381
T_247attachment_selection:b32c725c988ca94ceda98862ef7df60d-9df530055faf72516492ffae09c48c69-f12e1fd51070592c524268846c7d89b6-104b6490840528815487544f8b6bbd75+b44ff764768b0c037ecac40fa5a50a43:passed:20090228-191612:0.113510024
T_247attachment_selection:b32c725c988ca94ceda98862ef7df60d-9df530055faf72516492ffae09c48c69-f12e1fd51070592c524268846c7d89b6-104b6490840528815487544f8b6bbd75+bb1a0ce26f393b20541b593147e6c02b:passed:20090228-191612:0.113510024
T_248mpeg2:c8c53d0cda2e3d411b5fbfd4f55258b5-9ebea3f3ca9bfc7dd946d88a3a9880fc:passed:20090531-132819:8.128150931
T_249mpeg2_no_codecprivate:5c7cd1448703e8a9f9833e3f0e403db9:passed:20090531-132821:1.45695982
T_250tag_selection:9c4305408e0e554c1b7cfd1d76eda262-babfe57e09701b9e4a2ea5d030cdb697-cffb288a439fefcf4a97255726c50b90-427042640dbd4fa5fbf6a58f2f7f5141-79aaa97a5d6b24106f1cde250003f71c-79aaa97a5d6b24106f1cde250003f71c-0ca4f5905985fc16daf2556695b450c5:passed:20090531-205640:1.287172749
@ -204,7 +204,7 @@ T_355chapters:47e917b029d18abc6676c9abef5c0ded-74bd51e192c5c7a99da935c4b993badc-
T_356tags:4f2cf9f4181808220a9a6a6d7b70f1c6-59578a228c941903b9ae1aa46a2d464d-f1549d570d165fadbcd013042e96e755-130e5e2635d2072b71505340958d0e60-05fb17ffccc54721fe6462c723cecc4e-ok-ok-ok-ok-ok-ok-ok-ok-ok-ok-ok-ok-ok:passed:20120324-121752:0.430471559
T_357segment_info:8fd3bb9c42490a8b7dd1ae0bf06288bd-bcad09e97a98ecb1d330d69e4c35a54d-ok-ok-ok-ok-ok-ok-ok:passed:20120324-122844:0.227807646
T_358usf:07118fa4b5f8d7d63f4612544a2b1b75:passed:20120329-142144:0.051754089
T_359split_parts:14add8af7d016c048f0828708af04a86+c787a3d20fe2c26f7e0e0311f955a281+ok-e45e8371d819ccaa5c369c7060a3d646+ok-dac8e8500c582b658a28442873e43af1+ok-a44d973bca7503f6ce3eaecca60ba6bc+3145ceb7e2ee078b3e3ee0ee3537c25a+16bd445438312debe79fdc8f97aa913d+3f30d2f84eabe6a3ddf4b96249dd7409+cc46b789f5f093cd2c5262fd6e00c270+e147dd02086aa75d3dbb1d331c62e2b7+27b895b36e428126dd567be16c9777b5+ok-06ffb1c503836a0a6236bc8a3041b1e1+ok-8d7f1251df8bb2e5a00bdae80bcc6acf+ok:passed:20120331-133448:2.321768368
T_359split_parts:14add8af7d016c048f0828708af04a86+2f6dde591b46bf76350fef567149f6bb+ok-e45e8371d819ccaa5c369c7060a3d646+ok-dac8e8500c582b658a28442873e43af1+ok-a44d973bca7503f6ce3eaecca60ba6bc+abde2b0918d0a7661e00533b30dd4c65+5a409525bde9dd34e7aa836d556631cf+d328c9e14ba9cdc6fe93466583f639b2+f2dbb689690c3e5443dea53bfac9e1d2+e147dd02086aa75d3dbb1d331c62e2b7+27b895b36e428126dd567be16c9777b5+ok-06ffb1c503836a0a6236bc8a3041b1e1+ok-8d7f1251df8bb2e5a00bdae80bcc6acf+ok:passed:20120331-133448:2.321768368
T_360X_chapters_hex_format:0637a4864b492106116e3ec7733c5118-3853793b0d88fc10efadb146ca948833:passed:20120404-152038:0.047282116
T_361file_concatenation:dec1ea028b2f9d8aa0d7d7a6872be7cb-be498d7d29a3fbe5f2efb2f4a5e9b133-be498d7d29a3fbe5f2efb2f4a5e9b133-3af2f60c860060bee56fc18d62632c0d-3af2f60c860060bee56fc18d62632c0d-3af2f60c860060bee56fc18d62632c0d-b96575ae032a25eb62652e460cf54361-61a896befd3688c7273671a3eca814b5-eefe88fddc659b50fe075fa0548c8752-eefe88fddc659b50fe075fa0548c8752-eefe88fddc659b50fe075fa0548c8752-eefe88fddc659b50fe075fa0548c8752-bf53818a8c55c98b7d2c86bac06b72ca-67a59c4960f092526c09d18c032201bf-42becd5ba99200b3c859e51b21e0fb12-42becd5ba99200b3c859e51b21e0fb12:passed:20120406-144928:18.646532342
T_362xtr_avc:1fbfce7cde19310d1b03f90b06cdd29f-ce680f3ae594f3842b638dcb2949e220:passed:20120416-153515:1.811589633
@ -225,12 +225,12 @@ T_376append_empty_tracks:295d44ce983eaffb3535ffe25a60abf4-f37e09068a90e39a117167
T_377mp3_skip_id3_properly:7f64ea961b9e5e1409d07d7d5b070d09:passed:20121216-212310:0.050076417
T_378deprecated_iso_639_2_codes:hrv+rum+srp-0576771ea804a43fe3dc0bbb6ab3abae:passed:20121217-171624:0.080978498
T_379flv:410991a66702a9c085e79a08a7c12a34-8c53cc6b896ff2f158c9273d7f453e91-f4a3b97a857c48afa75a79457ebbab70-8c53cc6b896ff2f158c9273d7f453e91-df2420dab0717518124168646c670ffc-e3cdbe4c0713d03fd9e50e56b35ba3af-87303ffc0dc8e2f4c299f8b5574ca1cc-e3cdbe4c0713d03fd9e50e56b35ba3af-8243554b2913f5d4cc61ecae31b4367c-3c4fe6adc09ccc54a92fc570a7a679ed-efbe31f64bccfbaa68f345578a2dca21-3c4fe6adc09ccc54a92fc570a7a679ed:passed:20121223-134722:1.700533979
T_380split_frames:a632ff2e05d6f68afdee293f57d607f0+376c161d93e8c2a0c5021c0729d8896c+ok-a632ff2e05d6f68afdee293f57d607f0+376c161d93e8c2a0c5021c0729d8896c+ok-a632ff2e05d6f68afdee293f57d607f0+376c161d93e8c2a0c5021c0729d8896c+ok:passed:20121223-232902:1.685037717
T_380split_frames:a632ff2e05d6f68afdee293f57d607f0+8f840d8559f2ddc9074312048d2d1714+ok-a632ff2e05d6f68afdee293f57d607f0+8f840d8559f2ddc9074312048d2d1714+ok-a632ff2e05d6f68afdee293f57d607f0+8f840d8559f2ddc9074312048d2d1714+ok:passed:20121223-232902:1.685037717
T_381X_alac:bf27f11ef2cc46c8490fe6ecfbc9d47c-ed3dd47220947f8130974268f0af281d:passed:20121225-133740:0.075635313
T_382split_chapters:a1e1d6d41c92be09d9a95fe5764114b7+be25f966d8d05465491385a420cd1f9b+ok-5c5af0dc62b3b89b82200f6403df0221+03badbdab502b87e0f323e486e0cf40c+ok-bb74964c4b506354644b44b9b708459b+ccb2820f7eaea1b7b8f6ce5dfaa49a42+5f173df7cac05e7f3b1e011f7ac11c37+9bbdb9c0a1bd8998b5a5f319f43b4467+cdb5fb3c0fca831197790d34ed6051e0+7df76b63982a52395ea60aefba868b0f+d1c79114e56bce7d0f94a46959f1b798+83d8ba0b23b5164dc0d77addf918d72b+cc793dee16a6f415140ee517362523c5+c185c1db2311b6f5c2c20a70c918b4c9+84c2b1d17b46f649d4403e656288eb86+f1cb9f095909589e8e2c1b9d9f4266ba+fa86a16643a67f1a26b907e6e8d429ff+d83eb854a21979dfaa76a6f02436988b+226d9e0318f4fbb1af2acad99f5213ab+cebbf300ffc6c4e9675c253263c5a1b3+8db5db08e53b7e72ecd64689fa2fdf50+ok-a0a9fcdf9234e441431adfbfb15fa3d2+b6a144bb30ebda343a565c8fc1c17d2f+3c38dc04b91ed7bf4e195171fe20c0ec+738438b9af0aa90ce250a8fa5948a27f+c8cd8d14108225c6035287f59b8b7c1f+365ca25d0630f39ab1bb784be80161d0+e04058a47d1fe4b21653345378e05f83+f9f471aa386cb71771c4c5baa5a9a13b+3c54e9aa549b7c04e47f9882fbe4357b+67cd66a1bbda95076d170471a63e2226+3aa7ea3e4c789333cdd1cdc134fbdce0+2098a443072d065de3ca840e811292a6+602aa1427e34c48d3e4cbc3aa6c180c8+81e0bfe6a1318600a97e45f3401ee324+ffa3e446fd733d2623dd8b46d5bac0f9+7820d04ee09e1cb883e3eafd467367f5+83e5e7ed87bc4010c12b4afe3f3da858+ok:passed:20121227-202501:1.734270221
T_382split_chapters:a1e1d6d41c92be09d9a95fe5764114b7+34057cb461e26b747be3ad30daaabaca+ok-5c5af0dc62b3b89b82200f6403df0221+d74f47a6870b5b54965628da9e4681b4+ok-bb74964c4b506354644b44b9b708459b+b15cfbdfbbd00c55befe352c0420d850+50177b09ad325eb86f1c6c556941eace+c848bdcaa7ebbcd8a90215a9ae117146+c911d027af270cdd80c3cdb6159bf8d7+d2fba9ac9e23e7063172311a87a0eb6b+1ff47a02181a22fd4db13b3ad4f6d02b+46b6f9515fc85123edace9bcd9424dab+33dd1e2649c9b09c3f7632d29c1f245d+cb0269cd6dd6cd8aeda35edbb66b6412+378929528f07f27b202f6507c19f4954+8d8cac7ea98f84611d8ac3d52793520c+dea5498b28c810f53d05227fcf28ecd2+feeb0294b26b0f320a7149bbb8b0ef6e+5906f26d16683cd32b81ae7ef6d82e7d+c94c3cfcd2c3c88fb1b008b8998faee5+c6170a7bb6930e619a0d386632581d54+ok-a0a9fcdf9234e441431adfbfb15fa3d2+85db1554f67f456cb760d8ada3e1b94e+9bc10b100be5e8a310afb7bcccd4af95+90c5bcd2138b8dd15bf8679dc9add063+7d9bf51ca7e638df2e623cb3ce163e24+663697e911f9528ce52cecd542435dd1+88fc221db6019a3c2d3ed83d43637c65+5ac5f1c5c2fa8f7c12f6ed66188b01af+0b9616b6fad9b17947917b07a4b99bd1+8e7e486166a2ee8e66e14bd7f0ba4950+511b5684e7cafc57995e8a50979871b3+a100142d51064545afd6a24fd181dd9f+39da88b585fb9b5114a56be2ea73e3ac+41e1e298bbc0050eb68a55acbc645ca0+a5a7cfab8962020dfeb365b47a9dbacc+119a615406b980edaba557962a0b6d59+f9f39360cd9ec925ea6775cd5c8d14bd+ok:passed:20121227-202501:1.734270221
T_383mp4_text_track_subtitles:76381141faab5737c5001b042d4b6235:passed:20121228-231519:0.102549441
T_384vobsub_in_mp4:f69916cda16ade4f31400b8b51388c03:passed:20130112-201109:0.674617717
T_385split_parts_frames:14add8af7d016c048f0828708af04a86+c787a3d20fe2c26f7e0e0311f955a281+ok-e1001084ce3512e9dc8940d4c9ade87d+ok-d1c052f274338865a10c8ac6bbd1d1a3+ok-a4401edb1f7c56909267babaaa0e252b+ok-5eaaeb9e142363b1d3abff097b8a93c6+ok:passed:20130114-224502:1.413443333
T_385split_parts_frames:14add8af7d016c048f0828708af04a86+2f6dde591b46bf76350fef567149f6bb+ok-e1001084ce3512e9dc8940d4c9ade87d+ok-d1c052f274338865a10c8ac6bbd1d1a3+ok-a4401edb1f7c56909267babaaa0e252b+ok-5eaaeb9e142363b1d3abff097b8a93c6+ok:passed:20130114-224502:1.413443333
T_386flv_vp6f:a0ab8eb0dedf2c8c472e818794c2ad64:passed:20130121-223417:0.187881106
T_387mp4_free_invalid_size:f3deb6abb3f60c0de606e166353a71b1:passed:20130216-003333:0.04107827
T_388split_parts_and_chapters:e1bc3ec155ec33bca8eec967aceab25a-389c3bd6f8eca14fea4ef663a59b2e83-04fa29b52eb8d4962edf4f010548b375:passed:20130216-203522:0.690018077