diff --git a/taglib/ebml/matroska/ebmlmatroskaaudio.cpp b/taglib/ebml/matroska/ebmlmatroskaaudio.cpp
index dee0a3d3..e2a8251d 100644
--- a/taglib/ebml/matroska/ebmlmatroskaaudio.cpp
+++ b/taglib/ebml/matroska/ebmlmatroskaaudio.cpp
@@ -48,7 +48,7 @@ public:
       if((value = info->getChild(Constants::TimecodeScale)))
         length *= value->getAsUnsigned();
       else
-		length *= 1000000;
+        length *= 1000000;
     }
     
     info = elem->getChild(Constants::Tracks);
diff --git a/tests/test_matroska.cpp b/tests/test_matroska.cpp
index a8fb6e9d..339f9a78 100644
--- a/tests/test_matroska.cpp
+++ b/tests/test_matroska.cpp
@@ -13,96 +13,96 @@ using namespace TagLib;
 
 class TestMatroska : public CppUnit::TestFixture
 {
-	CPPUNIT_TEST_SUITE(TestMatroska);
-	CPPUNIT_TEST(testPredefined);
-	CPPUNIT_TEST(testInsertAndExtract);
-	CPPUNIT_TEST(testAudioProperties);
-	CPPUNIT_TEST_SUITE_END();
-	
+  CPPUNIT_TEST_SUITE(TestMatroska);
+  CPPUNIT_TEST(testPredefined);
+  CPPUNIT_TEST(testInsertAndExtract);
+  CPPUNIT_TEST(testAudioProperties);
+  CPPUNIT_TEST_SUITE_END();
+  
 public:
-	void testPredefined()
-	{
-		ScopedFileCopy copy("matroska", ".mka");
-		string filename = copy.fileName();
-		
-		EBML::Matroska::File f(filename.c_str());
-		CPPUNIT_ASSERT(f.isValid());
-		
-		PropertyMap pm = f.properties();
-		PropertyMap::Iterator i = pm.find("ENCODER");
-		CPPUNIT_ASSERT(i != f.properties().end());
-		
-		CPPUNIT_ASSERT_EQUAL(String("Lavf54.63.104"), i->second.front());
-	}
+  void testPredefined()
+  {
+    ScopedFileCopy copy("matroska", ".mka");
+    string filename = copy.fileName();
+    
+    EBML::Matroska::File f(filename.c_str());
+    CPPUNIT_ASSERT(f.isValid());
+    
+    PropertyMap pm = f.properties();
+    PropertyMap::Iterator i = pm.find("ENCODER");
+    CPPUNIT_ASSERT(i != f.properties().end());
+    
+    CPPUNIT_ASSERT_EQUAL(String("Lavf54.63.104"), i->second.front());
+  }
 	
-	void testInsertAndExtract()
-	{
-		ScopedFileCopy copy("matroska", ".mka");
-		string filename = copy.fileName();
-		
-		EBML::Matroska::File f1(filename.c_str());
-		CPPUNIT_ASSERT(f1.isValid());
-		
-		Tag* t = f1.tag();
-		
-		CPPUNIT_ASSERT(t != 0);
-		t->setTitle("Seconds of Silence");
-		t->setArtist("Nobody");
-		t->setAlbum("TagLib Test Suite");
-		t->setComment("Well, there's nothing to say - a few special signs: ©’…ä–€ſ");
-		t->setGenre("Air");
-		t->setYear(2013);
-		t->setTrack(15);
-		
-		CPPUNIT_ASSERT(f1.save());
-		
-		EBML::Matroska::File f2(filename.c_str());
-		CPPUNIT_ASSERT(f2.isValid());
-		
-		t = f2.tag();
-		
-		CPPUNIT_ASSERT(t != 0);
-		CPPUNIT_ASSERT_EQUAL(String("Seconds of Silence"), t->title());
-		CPPUNIT_ASSERT_EQUAL(String("Nobody"), t->artist());
-		CPPUNIT_ASSERT_EQUAL(String("TagLib Test Suite"), t->album());
-		CPPUNIT_ASSERT_EQUAL(String("Well, there's nothing to say - a few special signs: ©’…ä–€ſ"), t->comment());
-		CPPUNIT_ASSERT_EQUAL(String("Air"), t->genre());
-		CPPUNIT_ASSERT_EQUAL(2013u, t->year());
-		CPPUNIT_ASSERT_EQUAL(15u, t->track());
-		
-		PropertyMap pm = f2.properties();
-		pm.erase("COMMENT");
-		f2.setProperties(pm);
-		
-		CPPUNIT_ASSERT(f2.save());
-		
-		EBML::Matroska::File f3(filename.c_str());
-		CPPUNIT_ASSERT(f3.isValid());
-		
-		pm = f3.properties();
-		PropertyMap::Iterator i = pm.find("GENRE");
-		
-		CPPUNIT_ASSERT(i != pm.end());
-		CPPUNIT_ASSERT_EQUAL(String("Air"), i->second.front());
-	}
+  void testInsertAndExtract()
+  {
+    ScopedFileCopy copy("matroska", ".mka");
+    string filename = copy.fileName();
+    
+    EBML::Matroska::File f1(filename.c_str());
+    CPPUNIT_ASSERT(f1.isValid());
+    
+    Tag* t = f1.tag();
+    
+    CPPUNIT_ASSERT(t != 0);
+    t->setTitle("Seconds of Silence");
+    t->setArtist("Nobody");
+    t->setAlbum("TagLib Test Suite");
+    t->setComment("Well, there's nothing to say - a few special signs: ©’…ä–€ſ");
+    t->setGenre("Air");
+    t->setYear(2013);
+    t->setTrack(15);
+    
+    CPPUNIT_ASSERT(f1.save());
+    
+    EBML::Matroska::File f2(filename.c_str());
+    CPPUNIT_ASSERT(f2.isValid());
+    
+    t = f2.tag();
+    
+    CPPUNIT_ASSERT(t != 0);
+    CPPUNIT_ASSERT_EQUAL(String("Seconds of Silence"), t->title());
+    CPPUNIT_ASSERT_EQUAL(String("Nobody"), t->artist());
+    CPPUNIT_ASSERT_EQUAL(String("TagLib Test Suite"), t->album());
+    CPPUNIT_ASSERT_EQUAL(String("Well, there's nothing to say - a few special signs: ©’…ä–€ſ"), t->comment());
+    CPPUNIT_ASSERT_EQUAL(String("Air"), t->genre());
+    CPPUNIT_ASSERT_EQUAL(2013u, t->year());
+    CPPUNIT_ASSERT_EQUAL(15u, t->track());
+    
+    PropertyMap pm = f2.properties();
+    pm.erase("COMMENT");
+    f2.setProperties(pm);
+    
+    CPPUNIT_ASSERT(f2.save());
+    
+    EBML::Matroska::File f3(filename.c_str());
+    CPPUNIT_ASSERT(f3.isValid());
+    
+    pm = f3.properties();
+    PropertyMap::Iterator i = pm.find("GENRE");
+    
+    CPPUNIT_ASSERT(i != pm.end());
+    CPPUNIT_ASSERT_EQUAL(String("Air"), i->second.front());
+  }
 	
-	void testAudioProperties()
-	{
-		ScopedFileCopy copy("matroska", ".mka");
-		string filename = copy.fileName();
-		
-		EBML::Matroska::File f(filename.c_str());
-		CPPUNIT_ASSERT(f.isValid());
-		
-		AudioProperties* a = f.audioProperties();
-		CPPUNIT_ASSERT(a != 0);
-		
-		// Not a very nice assertion...
-		CPPUNIT_ASSERT_EQUAL(a->length(), 0);
-		// Bitrate is not nice and thus not tested.
-		CPPUNIT_ASSERT_EQUAL(a->sampleRate(), 44100);
-		CPPUNIT_ASSERT_EQUAL(a->channels(), 2);
-	}
+  void testAudioProperties()
+  {
+    ScopedFileCopy copy("matroska", ".mka");
+    string filename = copy.fileName();
+    
+    EBML::Matroska::File f(filename.c_str());
+    CPPUNIT_ASSERT(f.isValid());
+    
+    AudioProperties* a = f.audioProperties();
+    CPPUNIT_ASSERT(a != 0);
+    
+    // Not a very nice assertion...
+    CPPUNIT_ASSERT_EQUAL(a->length(), 0);
+    // Bitrate is not nice and thus not tested.
+    CPPUNIT_ASSERT_EQUAL(a->sampleRate(), 44100);
+    CPPUNIT_ASSERT_EQUAL(a->channels(), 2);
+  }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestMatroska);