diff --git a/AUTHORS b/AUTHORS index 770f1963f..1455deab8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -153,6 +153,10 @@ Niemayer, Peter Nishimra, Katsuhiko * Japanese translation for the man pages +Peebles, John + * bug fix for creating cues for multiple entries with the same + timecode + Pettenò, Diego * Support for liblzo2 diff --git a/ChangeLog b/ChangeLog index 98251007a..c4f90c292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-25 John Peebles + + * mkvmerge: bug fix: If a single subtitle track contains two or + more entries at the same timecode then the cue duration and cue + relative position elements written were wrong. + 2014-05-24 Moritz Bunkus * mkvinfo: bug fix: fixed wrong progress percentage shown during diff --git a/tests/results.txt b/tests/results.txt index c0fd1255c..e1cfa2670 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -275,3 +275,4 @@ T_426extract_write_bom_only_once:a9255d40de93e2731aaead0a746e582f-a9255d40de93e2 T_427ui_locale_pt_BR:8719aedc77a0435129c79e3a061642bf-344b51e9ae6fe2d8ce60fef18ee0e7d1:passed:20140418-103113:0.143370167 T_428mkv_misdetected_as_ass:e93bf556dd2814f52c44e523ae5b8721:passed:20140518-155446:0.033341203 T_429track_statistics_tags:8cd0ea5c12df71aae4aa78049142638d-7601976ec2210efb7867cb5067acd319-5acc3b1a01911b88be287abbe6e5b59a-bbda48963dde87a008a3c11bcdc8421b:passed:20140524-194544:0.635343822 +T_430cues_multiple_blocks_same_timecode:bf7b9dfac4811cfcd5ef871504a6f27c:passed:20140525-173642:0.033316759 diff --git a/tests/test-430cues_multiple_blocks_same_timecode.rb b/tests/test-430cues_multiple_blocks_same_timecode.rb new file mode 100755 index 000000000..12da370f9 --- /dev/null +++ b/tests/test-430cues_multiple_blocks_same_timecode.rb @@ -0,0 +1,4 @@ +#!/usr/bin/ruby -w + +describe "mkvmerge / Cues for tracks with multiple blocks at the same timecode" +test_merge "data/subtitles/srt/two-at-same-timecode.srt"