From c8782b4d24bf731c64860728875ed6f79924ec59 Mon Sep 17 00:00:00 2001
From: Oswald de Bruin <oswald@mint>
Date: Wed, 26 Jun 2013 16:13:14 +0200
Subject: [PATCH] Merge branch 'Oswald_MP4_EDITS' of github.com:DDVTECH/libmist
 into Oswald_MP4_EDITS

Conflicts:
	lib/mp4.cpp

No idea what happened
---
 lib/mp4.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mp4.cpp b/lib/mp4.cpp
index f83defa0..b50cd7eb 100644
--- a/lib/mp4.cpp
+++ b/lib/mp4.cpp
@@ -2863,7 +2863,7 @@ namespace MP4 {
     setMatrix(0,7);*/
     //fills automatically with zero's
     setMatrix(0x40000000,8);
-    setTrackID(0);
+    setTrackID(1);
   }
   
   void MVHD::setCreationTime(uint64_t newCreationTime){