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

Set doc type read version only to 2 even if stereo mode is used

Browse Source 
Fix for bug 625
This commit is contained in:
Moritz Bunkus 2011-05-11 22:31:21 +02:00
parent 4cac3a4382
commit e718b02245
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-11 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: The 'doc type read version' EBML header field
is only set to 2 even if a stereo mode other than 'none' is used
for at least one video track. Fix for bug 625.
2011-05-06 Moritz Bunkus <moritz@bunkus.org>
* mkvpropedit: new feature: Added support for adding, replacing

8
src/merge/output_control.cpp
View File

@ -586,14 +586,12 @@ render_ebml_head(mm_io_c *out) {
if (NULL == s_head)
s_head = new EbmlHead;
unsigned int doctype_version = g_stereo_mode_used ? 3
: hack_engaged(ENGAGE_NO_SIMPLE_BLOCKS) ? 1
: 2;
unsigned int doc_type_read_version = hack_engaged(ENGAGE_NO_SIMPLE_BLOCKS) ? 1 : 2;
GetChildAs<EDocType, EbmlString>(*s_head) = outputting_webm() ? "webm" : "matroska";
GetChildAs<EDocTypeVersion, EbmlUInteger>(*s_head) = doctype_version;
GetChildAs<EDocTypeReadVersion, EbmlUInteger>(*s_head) = doctype_version;
GetChildAs<EDocTypeVersion, EbmlUInteger>(*s_head) = g_stereo_mode_used ? 3 : doc_type_read_version;
GetChildAs<EDocTypeReadVersion, EbmlUInteger>(*s_head) = doc_type_read_version;
s_head->Render(*out, true);
}

2
tests/results.txt
View File

@ -68,7 +68,7 @@ T_218theora:59986cbebb1a61762c16ae591ae8c345-88d9297a7f549c68aea49c3b4abf007a:pa
T_219srt_short_timecodes:1350b59f405cabe1107c752f009f2f2a:passed:20060926-112658:0.213195421
T_220ass_with_comments_at_start:4aad786f675e15a5efd623cb8d822cff:passed:20060926-120101:0.839985533
T_221aac_lc_misdetected_as_sbr:aec2d52214eb5ff0574cea97df1597d3:passed:20061103-174221:0.021446207
T_222stereo_mode:34d9fa19579e3e6847d87f17ff2734a9-e3a34b71995f476b45c55f2cc8a47718-b36062c2d854ac9fe24cfa3eb4b355a7-eb5a3217e74f17dac26a3f74d5631471:passed:20061107-092251:3.215570467
T_222stereo_mode:595b97f0243c934f95080366c9b42e10-9193456cc987ee69a07d21cbd4d0476a-94f0adf0f87e91e0cf34d182881849db-eb5a3217e74f17dac26a3f74d5631471:passed:20061107-092251:3.215570467
T_223ra_cook_keyframes:08b7c346362512c20bb0eb3ab4b5756c:passed:20061228-150947:4.592656226
T_224dts:e2e2897b1d6cffd4f59857d42cab14cd-9adf697c116601792eb6c94ac70e2d8e:passed:20070206-174735:3.294211551
T_225dts_in_wav:c4dd95c4c03612f468761b4b376e0b20-bb4c0ecc736bf7858f4db724f6a5afce:passed:20070206-174726:5.474995493