From f920e0650f39f590b532b78048bb0307bd66df8e Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sun, 3 Oct 2004 10:01:24 +0000
Subject: [PATCH] Merged 2263:2265

---
 src/mkvmerge.cpp  | 10 +++++-----
 tests/results.txt | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp
index 8602959a0..fd6d5ef3d 100644
--- a/src/mkvmerge.cpp
+++ b/src/mkvmerge.cpp
@@ -103,8 +103,6 @@ namespace libmatroska {
   };
 }
 
-
-
 // }}}
 
 // {{{ global structs and variables
@@ -1398,9 +1396,11 @@ render_headers(mm_io_c *rout) {
 
     kax_infos = &GetChild<KaxInfo>(*kax_segment);
 
-    kax_duration = new KaxMyDuration(video_track_present ?
-                                     EbmlFloat::FLOAT_32 :
-                                     EbmlFloat::FLOAT_64);
+    if (!video_track_present ||
+        (timecode_scale_mode == TIMECODE_SCALE_MODE_AUTO))
+      kax_duration = new KaxMyDuration(EbmlFloat::FLOAT_64);
+    else
+      kax_duration = new KaxMyDuration(EbmlFloat::FLOAT_32);
     *(static_cast<EbmlFloat *>(kax_duration)) = 0.0;
     kax_infos->PushElement(*kax_duration);
 
diff --git a/tests/results.txt b/tests/results.txt
index c2576b5a8..fa81c2273 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -5,29 +5,29 @@ T_004aacmp4:7b3a23c96c8df4c71d3dc59175680bb1:passed:20040825-175700
 T_005flac:62571b0e2b971b181992062252987190:passed:20040825-175700
 T_006oggflac:68cfdf432f987f04f454a9c222ece7d2:passed:20040825-175700
 T_007oggvorbis:bec4fb34f6bf5f7542dac36c21c856ab:passed:20040825-175700
-T_008avi_divx3_mp3:e34bf5b38226b1204c7e4389010c56d7:passed:20040825-175700
-T_009realvideo_3:743183b94b7ba360f5112915adf534aa:passed:20040825-175700
-T_010realvideo_4:a2d21e63eb84c76a47c51f33f1349f86:passed:20040825-175700
+T_008avi_divx3_mp3:767b7cad0fc95a67ecd63ae60d6771c3:passed:20040825-175700
+T_009realvideo_3:a0d70a589067fdd9ae67992c41fa595d:passed:20040825-175700
+T_010realvideo_4:0d25e4137c50066f43fd12da6a4871af:passed:20040825-175700
 T_011srt:d7ac4923916c695a9b47425a90e39a0b:passed:20040825-175700
 T_012ssa:9ecbc6bdfa5dec6495f99c7a97342844:passed:20040825-175700
 T_013vobsubs:8983288ea21b811fbb85d2ea272ccfe5:passed:20040825-175700
-T_014splitting_by_size:fcd11d09729895d83f6882b76f42a1b1-4c3b819f3c2c235cfe916157e143e47e:passed:20040825-175700
-T_015splitting_by_time:9b0be8cdb7f9e71d85b181a88de9bcfd-06bb2248071ffdad31051845ba3bc0cb:passed:20040825-175700
+T_014splitting_by_size:feeb1aba481b5a51d7142599359f2eac-eacf20880a6dff6fc1128c1ffd47d23b:passed:20040825-175700
+T_015splitting_by_time:d0e769a906ec4eacc9c9af929add6474-6f8dd1e514ea2a76941fb841d25a06dc:passed:20040825-175700
 T_016cuesheet:36b2caef2575769b68389dcb81b27bf0:passed:20040825-175700
 T_017chapters:990b4b6b0931b7d52e589f715c919e10-4fff45a76f54708f881312aca04fd887:passed:20040825-175700
 T_018attachments:bac27359516bab4984df3021aa295213-7e8e1f17615f157db0e98fba9ad88bad:passed:20040825-175700
-T_019attachments2:ecb20381a0cd854909efd90abccc2cd2-80f3bd226b3aa121df27da2981a4b21f-ecb20381a0cd854909efd90abccc2cd2-4c3b819f3c2c235cfe916157e143e47e:passed:20040825-175700
-T_020languages:dc7b370dbe8c60851a5c76a18ef3768b:passed:20040825-234208
-T_021aspect_ratio:7af421f7f38723f6821b53577cb26b74-99d2e3c3e92c5a00883e468ce8285c35:passed:20040825-234244
-T_022display_dimensions:57551eda83dd4b149c6f5a5c6da5ce8f:passed:20040825-234339
-T_023no_x:718a4efee813ebfe7efee93c8e6a3296-c8ff96f9dc08f98dfbebe19275aeb125-cbfebbc09ce8b5395f42f8989c0bd3ba:passed:20040825-234343
+T_019attachments2:8d9ba46c4edbf3daf50175f9de2f87b4-689f99b17a166efe5457f16bff240b93-8d9ba46c4edbf3daf50175f9de2f87b4-eacf20880a6dff6fc1128c1ffd47d23b:passed:20040825-175700
+T_020languages:b89d3e9bfdf8cd49d7fc01b4d639841d:passed:20040825-234208
+T_021aspect_ratio:f6e8aa4cfd776d99ff824f21d4e3c640-990a5f94678b5c8886dc8c3a5c6a22dd:passed:20040825-234244
+T_022display_dimensions:108880396ffe5244465a3d25e8a57f93:passed:20040825-234339
+T_023no_x:c5b2b2f4d0d478f5bfe3e3704a513b2a-c8ff96f9dc08f98dfbebe19275aeb125-66105284756c6867756143920a242960:passed:20040825-234343
 T_024sync_mp3:a6c35d309947a52196d2a5428f87224a-6a638028d795bd48db95446f3521c302:passed:20040825-234344
 T_025sync_vorbis:e9d13a6b769cf6c2e4987bf6bd160698-51fcfab150642a66484d3c6bedff697a:passed:20040825-234344
 T_026sync_pcm:f337f057c059d771128206c0da3d4807-9b559191edb65655e49186c302c4b815:passed:20040825-234346
-T_027default_track:b8c4154c98a252d1ff68d885a2a5590f:passed:20040825-234348
+T_027default_track:8c29d3a993ed0ac6bc0a7f8535a69f07:passed:20040825-234348
 T_028compression:f6c15855e42e5a0e80d22a2060ae13e8:passed:20040825-234348
-T_029link:b3076d997bcdb4202de374ba77a2a5c6:passed:20040825-235039
-T_032cues:2d852a5c1ee169ddc713318c86a0b616:passed:20040825-235040
+T_029link:49e174d0a7700ea2e288e20ddb85cc2a:passed:20040825-235039
+T_032cues:73c0452451a00010299e191a39c783f9:passed:20040825-235040
 T_033timecode_scale:ba6bc8dff27d7d9fd433670067fa716d-d54414d993caad6cea47ef7913cb13db:passed:20040825-235040
 T_034ac3misdetected_as_mp2:f6765afb6d86ae09e0859f32ba65ced4:passed:20040920-100447
 T_035X_vfw_video:5bcb3426b2635ae5c89a5e5fe46aa416:passed:20040920-185358