moved bento4 one dir up

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2284 10f7b99b-c216-0410-bff0-8a66a9350fd8

144 files changed, 586 insertions, 586 deletions

diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Config/Ap4Config.h b/src/filters/parser/MP4Splitter/AP4/Config/Ap4Config.h
index 143d2e86c..143d2e86c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Config/Ap4Config.h
+++ b/src/filters/parser/MP4Splitter/AP4/Config/Ap4Config.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4.h
index d3ec27b40..e0d46a546 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4.h
@@ -32,7 +32,7 @@
 /*----------------------------------------------------------------------
 |       includes
 +---------------------------------------------------------------------*/
-#include "../../../StdAfx.h"
+#include "../../stdAfx.h"
 #include "Ap4Config.h"
 #include "Ap4Types.h"
 #include "Ap4Constants.h"
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Array.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Array.h
index 2a5d4e43e..2a5d4e43e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Array.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Array.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Atom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.cpp
index 57ca254d9..57ca254d9 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Atom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Atom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
index b661f2a43..b661f2a43 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Atom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomFactory.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
index 99d74643d..99d74643d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomFactory.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomFactory.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.h
index f8faf5813..f8faf5813 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomFactory.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomSampleTable.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomSampleTable.cpp
index c142d0193..c142d0193 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomSampleTable.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomSampleTable.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomSampleTable.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomSampleTable.h
index 68a71d13b..68a71d13b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AtomSampleTable.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomSampleTable.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AvcCAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AvcCAtom.cpp
index 52738ea75..52738ea75 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AvcCAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AvcCAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AvcCAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AvcCAtom.h
index 00acf7e9e..00acf7e9e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4AvcCAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AvcCAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ByteStream.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ByteStream.cpp
index 0385c3a7b..0385c3a7b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ByteStream.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ByteStream.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ByteStream.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ByteStream.h
index 2e0e99deb..2e0e99deb 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ByteStream.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ByteStream.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ChplAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ChplAtom.cpp
index fca8b5795..fca8b5795 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ChplAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ChplAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ChplAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ChplAtom.h
index 7e6ba9b82..7e6ba9b82 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ChplAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ChplAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CmvdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CmvdAtom.cpp
index 83e683617..83e683617 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CmvdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CmvdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CmvdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CmvdAtom.h
index e61664724..e61664724 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CmvdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CmvdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Co64Atom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Co64Atom.cpp
index 9c3214826..9c3214826 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Co64Atom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Co64Atom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Co64Atom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Co64Atom.h
index aa0c6df06..aa0c6df06 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Co64Atom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Co64Atom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Constants.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Constants.h
index 5e693f3a7..5e693f3a7 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Constants.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Constants.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ContainerAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ContainerAtom.cpp
index f8774ffc1..f8774ffc1 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ContainerAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ContainerAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ContainerAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ContainerAtom.h
index ed68726b8..ed68726b8 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4ContainerAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4ContainerAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CttsAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CttsAtom.cpp
index 5cbdf17a0..5cbdf17a0 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CttsAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CttsAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CttsAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CttsAtom.h
index 9f5dab8ff..9f5dab8ff 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4CttsAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4CttsAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataAtom.cpp
index 97c72d283..97c72d283 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataAtom.h
index 2c339c1d2..2c339c1d2 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataBuffer.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataBuffer.cpp
index 36e8ca25e..36e8ca25e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataBuffer.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataBuffer.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataBuffer.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataBuffer.h
index 529e842d6..529e842d6 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DataBuffer.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DataBuffer.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DcomAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DcomAtom.cpp
index 12878c43c..12878c43c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DcomAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DcomAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DcomAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DcomAtom.h
index 541bb3bfa..541bb3bfa 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DcomAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DcomAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Debug.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Debug.cpp
index b9903d5c5..b9903d5c5 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Debug.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Debug.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Debug.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Debug.h
index f99aaa79e..f99aaa79e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Debug.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Debug.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderConfigDescriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderConfigDescriptor.cpp
index de442df29..de442df29 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderConfigDescriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderConfigDescriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderConfigDescriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderConfigDescriptor.h
index 1b7e02a77..1b7e02a77 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderConfigDescriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderConfigDescriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderSpecificInfoDescriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderSpecificInfoDescriptor.cpp
index 092458585..092458585 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderSpecificInfoDescriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderSpecificInfoDescriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderSpecificInfoDescriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderSpecificInfoDescriptor.h
index f5e6e3cd4..f5e6e3cd4 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DecoderSpecificInfoDescriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DecoderSpecificInfoDescriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Descriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Descriptor.cpp
index e9edafbf3..e9edafbf3 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Descriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Descriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Descriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Descriptor.h
index e2e6689f9..e2e6689f9 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Descriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Descriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DescriptorFactory.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DescriptorFactory.cpp
index d2ebd8676..d2ebd8676 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DescriptorFactory.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DescriptorFactory.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DescriptorFactory.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DescriptorFactory.h
index 2d9ab4264..2d9ab4264 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DescriptorFactory.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DescriptorFactory.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DrefAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DrefAtom.cpp
index 0157c2969..0157c2969 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DrefAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DrefAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DrefAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DrefAtom.h
index 55679f0be..55679f0be 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4DrefAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4DrefAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsDescriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsDescriptor.cpp
index 1d305869b..1d305869b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsDescriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsDescriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsDescriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsDescriptor.h
index e52b67d1d..e52b67d1d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsDescriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsDescriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsdsAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsdsAtom.cpp
index 7be18b6f8..7be18b6f8 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsdsAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsdsAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsdsAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsdsAtom.h
index 2e3a114cd..2e3a114cd 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4EsdsAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4EsdsAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4File.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4File.cpp
index 22cac9a3d..22cac9a3d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4File.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4File.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4File.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4File.h
index 351ea6304..351ea6304 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4File.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4File.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileByteStream.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileByteStream.h
index 564813597..564813597 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileByteStream.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileByteStream.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileWriter.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileWriter.cpp
index 663fe9286..663fe9286 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileWriter.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileWriter.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileWriter.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileWriter.h
index b8f5b3df8..b8f5b3df8 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FileWriter.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FileWriter.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FrmaAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FrmaAtom.cpp
index 41a8a92f0..41a8a92f0 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FrmaAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FrmaAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FrmaAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FrmaAtom.h
index 8e15d7654..8e15d7654 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FrmaAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FrmaAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtabAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtabAtom.cpp
index 287238ebd..287238ebd 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtabAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtabAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtabAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtabAtom.h
index 0845347d5..0845347d5 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtabAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtabAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtypAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtypAtom.cpp
index a08637dbf..a08637dbf 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtypAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtypAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtypAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtypAtom.h
index 0eec5905b..0eec5905b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4FtypAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4FtypAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HdlrAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.cpp
index e6a14ffb8..e6a14ffb8 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HdlrAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HdlrAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h
index 63b9d1507..63b9d1507 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HdlrAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HdlrAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HintTrackReader.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HintTrackReader.cpp
index b3ae303bb..b3ae303bb 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HintTrackReader.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HintTrackReader.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HintTrackReader.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HintTrackReader.h
index a17aa13ed..a17aa13ed 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HintTrackReader.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HintTrackReader.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HmhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HmhdAtom.cpp
index cecac40da..cecac40da 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HmhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HmhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HmhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HmhdAtom.h
index a645dd3cc..a645dd3cc 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4HmhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4HmhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IkmsAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IkmsAtom.cpp
index cb5187127..cb5187127 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IkmsAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IkmsAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IkmsAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IkmsAtom.h
index 7ff6efb40..7ff6efb40 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IkmsAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IkmsAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Interfaces.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Interfaces.h
index 8b505e93c..8b505e93c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Interfaces.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Interfaces.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsfmAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsfmAtom.cpp
index 3757df81d..3757df81d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsfmAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsfmAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsfmAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsfmAtom.h
index fd07277f2..fd07277f2 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsfmAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsfmAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsmaCryp.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsmaCryp.cpp
index 22b24a37b..22b24a37b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsmaCryp.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsmaCryp.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsmaCryp.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsmaCryp.h
index fd1ac7de4..fd1ac7de4 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4IsmaCryp.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4IsmaCryp.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4List.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4List.h
index 269986d6f..269986d6f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4List.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4List.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MdhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MdhdAtom.cpp
index 2e4c2bf50..2e4c2bf50 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MdhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MdhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MdhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MdhdAtom.h
index d5e0bba63..d5e0bba63 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MdhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MdhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MoovAtom.cpp
index ae662c1bd..cc0923679 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MoovAtom.cpp
@@ -35,7 +35,7 @@
 #include "Ap4AtomFactory.h"

 #include "Ap4DcomAtom.h"

 #include "Ap4CmvdAtom.h"

-#include "../../../../../../thirdparty/zlib/zlib.h"

+#include "../../../../../thirdparty/zlib/zlib.h"

 

 /*----------------------------------------------------------------------

 |       AP4_TrakAtomCollector

diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MoovAtom.h
index 215423173..215423173 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MoovAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Movie.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Movie.cpp
index 2a2d9ea41..2a2d9ea41 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Movie.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Movie.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Movie.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Movie.h
index fbd338b66..fbd338b66 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Movie.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Movie.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MvhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MvhdAtom.cpp
index c6dfd15fb..c6dfd15fb 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MvhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MvhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MvhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MvhdAtom.h
index b51ef174f..b51ef174f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MvhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4MvhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4NmhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4NmhdAtom.cpp
index 9a039b2d9..9a039b2d9 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4NmhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4NmhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4NmhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4NmhdAtom.h
index b7ad7d3ce..b7ad7d3ce 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4NmhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4NmhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Processor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Processor.cpp
index ec2918ac2..ec2918ac2 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Processor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Processor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Processor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Processor.h
index 7d1f03d4f..7d1f03d4f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Processor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Processor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Results.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Results.h
index 21d3cf5ed..21d3cf5ed 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Results.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Results.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpAtom.cpp
index 676792810..676792810 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpAtom.h
index 1ae414f60..1ae414f60 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpHint.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpHint.cpp
index 111ce13cb..111ce13cb 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpHint.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpHint.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpHint.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpHint.h
index b5cfd67f1..b5cfd67f1 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4RtpHint.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4RtpHint.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SLConfigDescriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SLConfigDescriptor.cpp
index e15821f8e..e15821f8e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SLConfigDescriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SLConfigDescriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SLConfigDescriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SLConfigDescriptor.h
index 19026b081..19026b081 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SLConfigDescriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SLConfigDescriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Sample.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Sample.cpp
index 9424e5982..9424e5982 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Sample.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Sample.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Sample.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Sample.h
index 184499f70..184499f70 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Sample.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Sample.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleDescription.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleDescription.cpp
index c2a1bbcb1..c2a1bbcb1 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleDescription.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleDescription.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleDescription.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleDescription.h
index 1097f7b78..1097f7b78 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleDescription.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleDescription.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleEntry.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleEntry.cpp
index 85d4a88dd..85d4a88dd 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleEntry.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleEntry.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleEntry.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleEntry.h
index 7220cfd58..7220cfd58 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleEntry.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleEntry.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleTable.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleTable.cpp
index 174122504..174122504 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleTable.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleTable.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleTable.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleTable.h
index 55f97a1b6..55f97a1b6 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SampleTable.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SampleTable.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SchmAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SchmAtom.cpp
index f0b3ff69b..f0b3ff69b 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SchmAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SchmAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SchmAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SchmAtom.h
index d5149fa1c..d5149fa1c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SchmAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SchmAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SdpAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SdpAtom.cpp
index fe086b895..fe086b895 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SdpAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SdpAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SdpAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SdpAtom.h
index 5ed54c9c2..5ed54c9c2 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SdpAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SdpAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SmhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SmhdAtom.cpp
index 6aa5f7b58..6aa5f7b58 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SmhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SmhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SmhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SmhdAtom.h
index eaabb8458..eaabb8458 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SmhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SmhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StcoAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StcoAtom.cpp
index 4875f5043..4875f5043 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StcoAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StcoAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StcoAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StcoAtom.h
index 7d34c932f..7d34c932f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StcoAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StcoAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StscAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StscAtom.cpp
index ce3101f02..ce3101f02 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StscAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StscAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StscAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StscAtom.h
index 09d4b905d..09d4b905d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StscAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StscAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StsdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StsdAtom.cpp
index 7c818538c..7c818538c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StsdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StsdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StsdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StsdAtom.h
index 83f1b036d..83f1b036d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StsdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StsdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StssAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StssAtom.cpp
index e6eaaf284..e6eaaf284 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StssAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StssAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StssAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StssAtom.h
index ecd763097..ecd763097 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StssAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StssAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StszAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StszAtom.cpp
index 8b3bfb37e..8b3bfb37e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StszAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StszAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StszAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StszAtom.h
index 91fd38aad..91fd38aad 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4StszAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4StszAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SttsAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SttsAtom.cpp
index 666207113..666207113 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SttsAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SttsAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SttsAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SttsAtom.h
index 2f56e2b5a..2f56e2b5a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SttsAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SttsAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SyntheticSampleTable.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SyntheticSampleTable.cpp
index ae06d760a..ae06d760a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SyntheticSampleTable.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SyntheticSampleTable.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SyntheticSampleTable.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SyntheticSampleTable.h
index b57639385..b57639385 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4SyntheticSampleTable.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4SyntheticSampleTable.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TimsAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TimsAtom.cpp
index 50ab62618..50ab62618 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TimsAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TimsAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TimsAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TimsAtom.h
index 8ae79ab5a..8ae79ab5a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TimsAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TimsAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TkhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TkhdAtom.cpp
index 560b2bedb..560b2bedb 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TkhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TkhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TkhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TkhdAtom.h
index 37b5c270f..37b5c270f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TkhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TkhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp
index 32e58baef..32e58baef 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.h
index 4b901e159..4b901e159 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Track.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrakAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrakAtom.cpp
index 15bd28412..15bd28412 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrakAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrakAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrakAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrakAtom.h
index 6eaaaa6e2..6eaaaa6e2 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrakAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrakAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrefTypeAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrefTypeAtom.cpp
index 504d08e34..504d08e34 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrefTypeAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrefTypeAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrefTypeAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrefTypeAtom.h
index 2c2f1412a..2c2f1412a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4TrefTypeAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4TrefTypeAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Types.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Types.h
index d6d4b6cb9..d6d4b6cb9 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Types.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Types.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UnknownDescriptor.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UnknownDescriptor.cpp
index 2b1c7414a..2b1c7414a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UnknownDescriptor.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UnknownDescriptor.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UnknownDescriptor.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UnknownDescriptor.h
index 60d5f5ae4..60d5f5ae4 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UnknownDescriptor.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UnknownDescriptor.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UrlAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UrlAtom.cpp
index b40be3504..b40be3504 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UrlAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UrlAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UrlAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UrlAtom.h
index ee63e365e..ee63e365e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4UrlAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4UrlAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Utils.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Utils.cpp
index 29f208d00..29f208d00 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Utils.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Utils.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Utils.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Utils.h
index 9943fe18a..9943fe18a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Utils.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Utils.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4VmhdAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4VmhdAtom.cpp
index fb0a5b032..fb0a5b032 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4VmhdAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4VmhdAtom.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4VmhdAtom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4VmhdAtom.h
index 43c8ea2d5..43c8ea2d5 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4VmhdAtom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4VmhdAtom.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4AesBlockCipher.cpp b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4AesBlockCipher.cpp
index 95eff4b7e..95eff4b7e 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4AesBlockCipher.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4AesBlockCipher.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4AesBlockCipher.h b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4AesBlockCipher.h
index 71137a063..71137a063 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4AesBlockCipher.h
+++ b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4AesBlockCipher.h
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4StreamCipher.cpp b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4StreamCipher.cpp
index 4352d23d0..4352d23d0 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4StreamCipher.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4StreamCipher.cpp
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4StreamCipher.h b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4StreamCipher.h
index b2b02d95b..e322b3d88 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Crypto/Ap4StreamCipher.h
+++ b/src/filters/parser/MP4Splitter/AP4/Crypto/Ap4StreamCipher.h
@@ -9,7 +9,7 @@
 /*----------------------------------------------------------------------
 |       includes
 +---------------------------------------------------------------------*/
-#include "../../../StdAfx.h"
+#include "../../stdAfx.h"
 
 #include "Ap4AesBlockCipher.h"
 #include "Ap4Results.h"
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
index 30833cbed..d3a7a138b 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				DisableSpecificWarnings="4812"

 			/>

@@ -102,7 +102,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4812"

@@ -160,7 +160,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				DisableSpecificWarnings="4812"

 			/>

@@ -219,7 +219,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 				EnableEnhancedInstructionSet="0"

 				DisableSpecificWarnings="4812"

@@ -279,7 +279,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

 				DisableSpecificWarnings="4812"

 			/>

@@ -354,7 +354,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4812"

@@ -429,7 +429,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				DisableSpecificWarnings="4812"

 			/>

@@ -504,7 +504,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses"

+				AdditionalIncludeDirectories=".\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				EnableEnhancedInstructionSet="0"

 				DisableSpecificWarnings="4812"

@@ -770,547 +770,547 @@
 					Name="Core"

 					>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4.h"

+						RelativePath=".\AP4\Core\Ap4.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Array.h"

+						RelativePath=".\AP4\Core\Ap4Array.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Atom.cpp"

+						RelativePath=".\AP4\Core\Ap4Atom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Atom.h"

+						RelativePath=".\AP4\Core\Ap4Atom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AtomFactory.cpp"

+						RelativePath=".\AP4\Core\Ap4AtomFactory.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AtomFactory.h"

+						RelativePath=".\AP4\Core\Ap4AtomFactory.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AtomSampleTable.cpp"

+						RelativePath=".\AP4\Core\Ap4AtomSampleTable.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AtomSampleTable.h"

+						RelativePath=".\AP4\Core\Ap4AtomSampleTable.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AvcCAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4AvcCAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4AvcCAtom.h"

+						RelativePath=".\AP4\Core\Ap4AvcCAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ByteStream.cpp"

+						RelativePath=".\AP4\Core\Ap4ByteStream.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ByteStream.h"

+						RelativePath=".\AP4\Core\Ap4ByteStream.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ChplAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4ChplAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ChplAtom.h"

+						RelativePath=".\AP4\Core\Ap4ChplAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4CmvdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4CmvdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4CmvdAtom.h"

+						RelativePath=".\AP4\Core\Ap4CmvdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Co64Atom.cpp"

+						RelativePath=".\AP4\Core\Ap4Co64Atom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Co64Atom.h"

+						RelativePath=".\AP4\Core\Ap4Co64Atom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Constants.h"

+						RelativePath=".\AP4\Core\Ap4Constants.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ContainerAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4ContainerAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4ContainerAtom.h"

+						RelativePath=".\AP4\Core\Ap4ContainerAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4CttsAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4CttsAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4CttsAtom.h"

+						RelativePath=".\AP4\Core\Ap4CttsAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DataAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4DataAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DataAtom.h"

+						RelativePath=".\AP4\Core\Ap4DataAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DataBuffer.cpp"

+						RelativePath=".\AP4\Core\Ap4DataBuffer.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DataBuffer.h"

+						RelativePath=".\AP4\Core\Ap4DataBuffer.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DcomAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4DcomAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DcomAtom.h"

+						RelativePath=".\AP4\Core\Ap4DcomAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Debug.cpp"

+						RelativePath=".\AP4\Core\Ap4Debug.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Debug.h"

+						RelativePath=".\AP4\Core\Ap4Debug.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DecoderConfigDescriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4DecoderConfigDescriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DecoderConfigDescriptor.h"

+						RelativePath=".\AP4\Core\Ap4DecoderConfigDescriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4DecoderSpecificInfoDescriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.h"

+						RelativePath=".\AP4\Core\Ap4DecoderSpecificInfoDescriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Descriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4Descriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Descriptor.h"

+						RelativePath=".\AP4\Core\Ap4Descriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DescriptorFactory.cpp"

+						RelativePath=".\AP4\Core\Ap4DescriptorFactory.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DescriptorFactory.h"

+						RelativePath=".\AP4\Core\Ap4DescriptorFactory.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DrefAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4DrefAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4DrefAtom.h"

+						RelativePath=".\AP4\Core\Ap4DrefAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4EsDescriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4EsDescriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4EsDescriptor.h"

+						RelativePath=".\AP4\Core\Ap4EsDescriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4EsdsAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4EsdsAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4EsdsAtom.h"

+						RelativePath=".\AP4\Core\Ap4EsdsAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4File.cpp"

+						RelativePath=".\AP4\Core\Ap4File.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4File.h"

+						RelativePath=".\AP4\Core\Ap4File.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FileByteStream.h"

+						RelativePath=".\AP4\Core\Ap4FileByteStream.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FileWriter.cpp"

+						RelativePath=".\AP4\Core\Ap4FileWriter.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FileWriter.h"

+						RelativePath=".\AP4\Core\Ap4FileWriter.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FrmaAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4FrmaAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FrmaAtom.h"

+						RelativePath=".\AP4\Core\Ap4FrmaAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FtabAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4FtabAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FtabAtom.h"

+						RelativePath=".\AP4\Core\Ap4FtabAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FtypAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4FtypAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4FtypAtom.h"

+						RelativePath=".\AP4\Core\Ap4FtypAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HdlrAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4HdlrAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HdlrAtom.h"

+						RelativePath=".\AP4\Core\Ap4HdlrAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HintTrackReader.cpp"

+						RelativePath=".\AP4\Core\Ap4HintTrackReader.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HintTrackReader.h"

+						RelativePath=".\AP4\Core\Ap4HintTrackReader.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HmhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4HmhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4HmhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4HmhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IkmsAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4IkmsAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IkmsAtom.h"

+						RelativePath=".\AP4\Core\Ap4IkmsAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Interfaces.h"

+						RelativePath=".\AP4\Core\Ap4Interfaces.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IsfmAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4IsfmAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IsfmAtom.h"

+						RelativePath=".\AP4\Core\Ap4IsfmAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IsmaCryp.cpp"

+						RelativePath=".\AP4\Core\Ap4IsmaCryp.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4IsmaCryp.h"

+						RelativePath=".\AP4\Core\Ap4IsmaCryp.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4List.h"

+						RelativePath=".\AP4\Core\Ap4List.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MdhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4MdhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MdhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4MdhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MoovAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4MoovAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MoovAtom.h"

+						RelativePath=".\AP4\Core\Ap4MoovAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Movie.cpp"

+						RelativePath=".\AP4\Core\Ap4Movie.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Movie.h"

+						RelativePath=".\AP4\Core\Ap4Movie.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MvhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4MvhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4MvhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4MvhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4NmhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4NmhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4NmhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4NmhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Processor.cpp"

+						RelativePath=".\AP4\Core\Ap4Processor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Processor.h"

+						RelativePath=".\AP4\Core\Ap4Processor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Results.h"

+						RelativePath=".\AP4\Core\Ap4Results.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4RtpAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4RtpAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4RtpAtom.h"

+						RelativePath=".\AP4\Core\Ap4RtpAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4RtpHint.cpp"

+						RelativePath=".\AP4\Core\Ap4RtpHint.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4RtpHint.h"

+						RelativePath=".\AP4\Core\Ap4RtpHint.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Sample.cpp"

+						RelativePath=".\AP4\Core\Ap4Sample.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Sample.h"

+						RelativePath=".\AP4\Core\Ap4Sample.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleDescription.cpp"

+						RelativePath=".\AP4\Core\Ap4SampleDescription.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleDescription.h"

+						RelativePath=".\AP4\Core\Ap4SampleDescription.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleEntry.cpp"

+						RelativePath=".\AP4\Core\Ap4SampleEntry.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleEntry.h"

+						RelativePath=".\AP4\Core\Ap4SampleEntry.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleTable.cpp"

+						RelativePath=".\AP4\Core\Ap4SampleTable.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SampleTable.h"

+						RelativePath=".\AP4\Core\Ap4SampleTable.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SchmAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4SchmAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SchmAtom.h"

+						RelativePath=".\AP4\Core\Ap4SchmAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SdpAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4SdpAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SdpAtom.h"

+						RelativePath=".\AP4\Core\Ap4SdpAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SLConfigDescriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4SLConfigDescriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SLConfigDescriptor.h"

+						RelativePath=".\AP4\Core\Ap4SLConfigDescriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SmhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4SmhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SmhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4SmhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StcoAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4StcoAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StcoAtom.h"

+						RelativePath=".\AP4\Core\Ap4StcoAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StscAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4StscAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StscAtom.h"

+						RelativePath=".\AP4\Core\Ap4StscAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StsdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4StsdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StsdAtom.h"

+						RelativePath=".\AP4\Core\Ap4StsdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StssAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4StssAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StssAtom.h"

+						RelativePath=".\AP4\Core\Ap4StssAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StszAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4StszAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4StszAtom.h"

+						RelativePath=".\AP4\Core\Ap4StszAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SttsAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4SttsAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SttsAtom.h"

+						RelativePath=".\AP4\Core\Ap4SttsAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SyntheticSampleTable.cpp"

+						RelativePath=".\AP4\Core\Ap4SyntheticSampleTable.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4SyntheticSampleTable.h"

+						RelativePath=".\AP4\Core\Ap4SyntheticSampleTable.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TimsAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4TimsAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TimsAtom.h"

+						RelativePath=".\AP4\Core\Ap4TimsAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TkhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4TkhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TkhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4TkhdAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Track.cpp"

+						RelativePath=".\AP4\Core\Ap4Track.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Track.h"

+						RelativePath=".\AP4\Core\Ap4Track.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TrakAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4TrakAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TrakAtom.h"

+						RelativePath=".\AP4\Core\Ap4TrakAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TrefTypeAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4TrefTypeAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4TrefTypeAtom.h"

+						RelativePath=".\AP4\Core\Ap4TrefTypeAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Types.h"

+						RelativePath=".\AP4\Core\Ap4Types.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4UnknownDescriptor.cpp"

+						RelativePath=".\AP4\Core\Ap4UnknownDescriptor.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4UnknownDescriptor.h"

+						RelativePath=".\AP4\Core\Ap4UnknownDescriptor.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4UrlAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4UrlAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4UrlAtom.h"

+						RelativePath=".\AP4\Core\Ap4UrlAtom.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Utils.cpp"

+						RelativePath=".\AP4\Core\Ap4Utils.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4Utils.h"

+						RelativePath=".\AP4\Core\Ap4Utils.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4VmhdAtom.cpp"

+						RelativePath=".\AP4\Core\Ap4VmhdAtom.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Core\Ap4VmhdAtom.h"

+						RelativePath=".\AP4\Core\Ap4VmhdAtom.h"

 						>

 					</File>

 				</Filter>

@@ -1318,7 +1318,7 @@
 					Name="Config"

 					>

 					<File

-						RelativePath=".\AP4\Source\Config\Ap4Config.h"

+						RelativePath=".\AP4\Config\Ap4Config.h"

 						>

 					</File>

 				</Filter>

@@ -1326,19 +1326,19 @@
 					Name="Crypto"

 					>

 					<File

-						RelativePath=".\AP4\Source\Crypto\Ap4AesBlockCipher.cpp"

+						RelativePath=".\AP4\Crypto\Ap4AesBlockCipher.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Crypto\Ap4AesBlockCipher.h"

+						RelativePath=".\AP4\Crypto\Ap4AesBlockCipher.h"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Crypto\Ap4StreamCipher.cpp"

+						RelativePath=".\AP4\Crypto\Ap4StreamCipher.cpp"

 						>

 					</File>

 					<File

-						RelativePath=".\AP4\Source\Crypto\Ap4StreamCipher.h"

+						RelativePath=".\AP4\Crypto\Ap4StreamCipher.h"

 						>

 					</File>

 				</Filter>

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj
index c27a232b3..9731a06d0 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj
@@ -152,7 +152,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

@@ -166,7 +166,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

@@ -178,7 +178,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

@@ -193,7 +193,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

@@ -206,7 +206,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

@@ -230,7 +230,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

@@ -252,7 +252,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

@@ -275,7 +275,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalIncludeDirectories>.\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\AP4\Core;.\AP4\Config;.\AP4\Crypto;..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <DisableSpecificWarnings>4812;%(DisableSpecificWarnings)</DisableSpecificWarnings>

@@ -295,72 +295,72 @@
   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="Ap4AsyncReaderStream.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Atom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4AtomFactory.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4AtomSampleTable.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4AvcCAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4ByteStream.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4ChplAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4CmvdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Co64Atom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4ContainerAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4CttsAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DataAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DataBuffer.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DcomAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Debug.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DecoderConfigDescriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Descriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DescriptorFactory.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4DrefAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4EsDescriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4EsdsAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4File.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4FileWriter.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4FrmaAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4FtabAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4FtypAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4HdlrAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4HintTrackReader.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4HmhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4IkmsAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4IsfmAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4IsmaCryp.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4MdhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4MoovAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Movie.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4MvhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4NmhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Processor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4RtpAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4RtpHint.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Sample.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SampleDescription.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SampleEntry.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SampleTable.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SchmAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SdpAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SLConfigDescriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SmhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4StcoAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4StscAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4StsdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4StssAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4StszAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SttsAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4SyntheticSampleTable.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4TimsAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4TkhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Track.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4TrakAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4TrefTypeAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4UnknownDescriptor.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4UrlAtom.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4Utils.cpp" />

-    <ClCompile Include="AP4\Source\Core\Ap4VmhdAtom.cpp" />

-    <ClCompile Include="AP4\Source\Crypto\Ap4AesBlockCipher.cpp" />

-    <ClCompile Include="AP4\Source\Crypto\Ap4StreamCipher.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Atom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4AtomFactory.cpp" />

+    <ClCompile Include="AP4\Core\Ap4AtomSampleTable.cpp" />

+    <ClCompile Include="AP4\Core\Ap4AvcCAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4ByteStream.cpp" />

+    <ClCompile Include="AP4\Core\Ap4ChplAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4CmvdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Co64Atom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4ContainerAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4CttsAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DataAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DataBuffer.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DcomAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Debug.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DecoderConfigDescriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DecoderSpecificInfoDescriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Descriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DescriptorFactory.cpp" />

+    <ClCompile Include="AP4\Core\Ap4DrefAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4EsDescriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4EsdsAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4File.cpp" />

+    <ClCompile Include="AP4\Core\Ap4FileWriter.cpp" />

+    <ClCompile Include="AP4\Core\Ap4FrmaAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4FtabAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4FtypAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4HdlrAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4HintTrackReader.cpp" />

+    <ClCompile Include="AP4\Core\Ap4HmhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4IkmsAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4IsfmAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4IsmaCryp.cpp" />

+    <ClCompile Include="AP4\Core\Ap4MdhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4MoovAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Movie.cpp" />

+    <ClCompile Include="AP4\Core\Ap4MvhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4NmhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Processor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4RtpAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4RtpHint.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Sample.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SampleDescription.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SampleEntry.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SampleTable.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SchmAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SdpAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SLConfigDescriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SmhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4StcoAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4StscAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4StsdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4StssAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4StszAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SttsAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4SyntheticSampleTable.cpp" />

+    <ClCompile Include="AP4\Core\Ap4TimsAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4TkhdAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Track.cpp" />

+    <ClCompile Include="AP4\Core\Ap4TrakAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4TrefTypeAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4UnknownDescriptor.cpp" />

+    <ClCompile Include="AP4\Core\Ap4UrlAtom.cpp" />

+    <ClCompile Include="AP4\Core\Ap4Utils.cpp" />

+    <ClCompile Include="AP4\Core\Ap4VmhdAtom.cpp" />

+    <ClCompile Include="AP4\Crypto\Ap4AesBlockCipher.cpp" />

+    <ClCompile Include="AP4\Crypto\Ap4StreamCipher.cpp" />

     <ClCompile Include="MP4Splitter.cpp">

       <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">false</PreprocessToFile>

       <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">false</PreprocessSuppressLineNumbers>

@@ -381,81 +381,81 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="Ap4AsyncReaderStream.h" />

-    <ClInclude Include="AP4\Source\Config\Ap4Config.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Array.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Atom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4AtomFactory.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4AtomSampleTable.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4AvcCAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4ByteStream.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4ChplAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4CmvdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Co64Atom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Constants.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4ContainerAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4CttsAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DataAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DataBuffer.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DcomAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Debug.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DecoderConfigDescriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Descriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DescriptorFactory.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4DrefAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4EsDescriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4EsdsAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4File.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4FileByteStream.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4FileWriter.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4FrmaAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4FtabAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4FtypAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4HdlrAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4HintTrackReader.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4HmhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4IkmsAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Interfaces.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4IsfmAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4IsmaCryp.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4List.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4MdhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4MoovAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Movie.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4MvhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4NmhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Processor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Results.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4RtpAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4RtpHint.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Sample.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SampleDescription.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SampleEntry.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SampleTable.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SchmAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SdpAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SLConfigDescriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SmhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4StcoAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4StscAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4StsdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4StssAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4StszAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SttsAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4SyntheticSampleTable.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4TimsAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4TkhdAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Track.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4TrakAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4TrefTypeAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Types.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4UnknownDescriptor.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4UrlAtom.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4Utils.h" />

-    <ClInclude Include="AP4\Source\Core\Ap4VmhdAtom.h" />

-    <ClInclude Include="AP4\Source\Crypto\Ap4AesBlockCipher.h" />

-    <ClInclude Include="AP4\Source\Crypto\Ap4StreamCipher.h" />

+    <ClInclude Include="AP4\Config\Ap4Config.h" />

+    <ClInclude Include="AP4\Core\Ap4.h" />

+    <ClInclude Include="AP4\Core\Ap4Array.h" />

+    <ClInclude Include="AP4\Core\Ap4Atom.h" />

+    <ClInclude Include="AP4\Core\Ap4AtomFactory.h" />

+    <ClInclude Include="AP4\Core\Ap4AtomSampleTable.h" />

+    <ClInclude Include="AP4\Core\Ap4AvcCAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4ByteStream.h" />

+    <ClInclude Include="AP4\Core\Ap4ChplAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4CmvdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Co64Atom.h" />

+    <ClInclude Include="AP4\Core\Ap4Constants.h" />

+    <ClInclude Include="AP4\Core\Ap4ContainerAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4CttsAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4DataAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4DataBuffer.h" />

+    <ClInclude Include="AP4\Core\Ap4DcomAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Debug.h" />

+    <ClInclude Include="AP4\Core\Ap4DecoderConfigDescriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4DecoderSpecificInfoDescriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4Descriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4DescriptorFactory.h" />

+    <ClInclude Include="AP4\Core\Ap4DrefAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4EsDescriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4EsdsAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4File.h" />

+    <ClInclude Include="AP4\Core\Ap4FileByteStream.h" />

+    <ClInclude Include="AP4\Core\Ap4FileWriter.h" />

+    <ClInclude Include="AP4\Core\Ap4FrmaAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4FtabAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4FtypAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4HdlrAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4HintTrackReader.h" />

+    <ClInclude Include="AP4\Core\Ap4HmhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4IkmsAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Interfaces.h" />

+    <ClInclude Include="AP4\Core\Ap4IsfmAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4IsmaCryp.h" />

+    <ClInclude Include="AP4\Core\Ap4List.h" />

+    <ClInclude Include="AP4\Core\Ap4MdhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4MoovAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Movie.h" />

+    <ClInclude Include="AP4\Core\Ap4MvhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4NmhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Processor.h" />

+    <ClInclude Include="AP4\Core\Ap4Results.h" />

+    <ClInclude Include="AP4\Core\Ap4RtpAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4RtpHint.h" />

+    <ClInclude Include="AP4\Core\Ap4Sample.h" />

+    <ClInclude Include="AP4\Core\Ap4SampleDescription.h" />

+    <ClInclude Include="AP4\Core\Ap4SampleEntry.h" />

+    <ClInclude Include="AP4\Core\Ap4SampleTable.h" />

+    <ClInclude Include="AP4\Core\Ap4SchmAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4SdpAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4SLConfigDescriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4SmhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4StcoAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4StscAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4StsdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4StssAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4StszAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4SttsAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4SyntheticSampleTable.h" />

+    <ClInclude Include="AP4\Core\Ap4TimsAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4TkhdAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Track.h" />

+    <ClInclude Include="AP4\Core\Ap4TrakAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4TrefTypeAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Types.h" />

+    <ClInclude Include="AP4\Core\Ap4UnknownDescriptor.h" />

+    <ClInclude Include="AP4\Core\Ap4UrlAtom.h" />

+    <ClInclude Include="AP4\Core\Ap4Utils.h" />

+    <ClInclude Include="AP4\Core\Ap4VmhdAtom.h" />

+    <ClInclude Include="AP4\Crypto\Ap4AesBlockCipher.h" />

+    <ClInclude Include="AP4\Crypto\Ap4StreamCipher.h" />

     <ClInclude Include="MP4Splitter.h" />

     <ClInclude Include="MP4SplitterFile.h" />

     <CustomBuildStep Include="resource.h">

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters
index f63f46fc7..25ee724a2 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters
@@ -19,13 +19,13 @@
     <Filter Include="AP4\Source">

       <UniqueIdentifier>{e352522c-046b-4a25-a06f-b7cb5a0a2e06}</UniqueIdentifier>

     </Filter>

-    <Filter Include="AP4\Source\Config">

+    <Filter Include="AP4\Config">

       <UniqueIdentifier>{8ac8d275-a9e7-48f9-b488-31c6320134ac}</UniqueIdentifier>

     </Filter>

-    <Filter Include="AP4\Source\Core">

+    <Filter Include="AP4\Core">

       <UniqueIdentifier>{cd2064e3-3060-4eea-8582-46f86a1756bb}</UniqueIdentifier>

     </Filter>

-    <Filter Include="AP4\Source\Crypto">

+    <Filter Include="AP4\Crypto">

       <UniqueIdentifier>{fc6a61aa-f447-4176-827e-48c743e37fce}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

@@ -42,203 +42,203 @@
     <ClCompile Include="stdafx.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Atom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Atom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4AtomFactory.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4AtomFactory.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4AtomSampleTable.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4AtomSampleTable.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4AvcCAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4AvcCAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4ByteStream.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4ByteStream.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4ChplAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4ChplAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4CmvdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4CmvdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Co64Atom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Co64Atom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4ContainerAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4ContainerAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4CttsAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4CttsAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DataAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DataAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DataBuffer.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DataBuffer.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DcomAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DcomAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Debug.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Debug.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DecoderConfigDescriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DecoderConfigDescriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DecoderSpecificInfoDescriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Descriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Descriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DescriptorFactory.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DescriptorFactory.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4DrefAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4DrefAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4EsDescriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4EsDescriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4EsdsAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4EsdsAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4File.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4File.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4FileWriter.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4FileWriter.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4FrmaAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4FrmaAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4FtabAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4FtabAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4FtypAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4FtypAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4HdlrAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4HdlrAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4HintTrackReader.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4HintTrackReader.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4HmhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4HmhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4IkmsAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4IkmsAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4IsfmAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4IsfmAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4IsmaCryp.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4IsmaCryp.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4MdhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4MdhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4MoovAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4MoovAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Movie.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Movie.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4MvhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4MvhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4NmhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4NmhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Processor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Processor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4RtpAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4RtpAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4RtpHint.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4RtpHint.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Sample.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Sample.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SampleDescription.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SampleDescription.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SampleEntry.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SampleEntry.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SampleTable.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SampleTable.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SchmAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SchmAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SdpAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SdpAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SLConfigDescriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SLConfigDescriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SmhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SmhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4StcoAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4StcoAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4StscAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4StscAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4StsdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4StsdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4StssAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4StssAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4StszAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4StszAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SttsAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SttsAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4SyntheticSampleTable.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4SyntheticSampleTable.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4TimsAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4TimsAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4TkhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4TkhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Track.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Track.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4TrakAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4TrakAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4TrefTypeAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4TrefTypeAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4UnknownDescriptor.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4UnknownDescriptor.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4UrlAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4UrlAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4Utils.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4Utils.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Core\Ap4VmhdAtom.cpp">

-      <Filter>AP4\Source\Core</Filter>

+    <ClCompile Include="AP4\Core\Ap4VmhdAtom.cpp">

+      <Filter>AP4\Core</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Crypto\Ap4AesBlockCipher.cpp">

-      <Filter>AP4\Source\Crypto</Filter>

+    <ClCompile Include="AP4\Crypto\Ap4AesBlockCipher.cpp">

+      <Filter>AP4\Crypto</Filter>

     </ClCompile>

-    <ClCompile Include="AP4\Source\Crypto\Ap4StreamCipher.cpp">

-      <Filter>AP4\Source\Crypto</Filter>

+    <ClCompile Include="AP4\Crypto\Ap4StreamCipher.cpp">

+      <Filter>AP4\Crypto</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

@@ -254,230 +254,230 @@
     <ClInclude Include="stdafx.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Config\Ap4Config.h">

-      <Filter>AP4\Source\Config</Filter>

+    <ClInclude Include="AP4\Config\Ap4Config.h">

+      <Filter>AP4\Config</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Array.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Array.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Atom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Atom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4AtomFactory.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4AtomFactory.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4AtomSampleTable.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4AtomSampleTable.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4AvcCAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4AvcCAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4ByteStream.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4ByteStream.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4ChplAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4ChplAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4CmvdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4CmvdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Co64Atom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Co64Atom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Constants.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Constants.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4ContainerAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4ContainerAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4CttsAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4CttsAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DataAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DataAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DataBuffer.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DataBuffer.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DcomAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DcomAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Debug.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Debug.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DecoderConfigDescriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DecoderConfigDescriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DecoderSpecificInfoDescriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DecoderSpecificInfoDescriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Descriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Descriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DescriptorFactory.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DescriptorFactory.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4DrefAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4DrefAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4EsDescriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4EsDescriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4EsdsAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4EsdsAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4File.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4File.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4FileByteStream.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4FileByteStream.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4FileWriter.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4FileWriter.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4FrmaAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4FrmaAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4FtabAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4FtabAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4FtypAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4FtypAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4HdlrAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4HdlrAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4HintTrackReader.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4HintTrackReader.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4HmhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4HmhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4IkmsAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4IkmsAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Interfaces.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Interfaces.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4IsfmAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4IsfmAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4IsmaCryp.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4IsmaCryp.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4List.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4List.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4MdhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4MdhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4MoovAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4MoovAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Movie.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Movie.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4MvhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4MvhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4NmhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4NmhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Processor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Processor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Results.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Results.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4RtpAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4RtpAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4RtpHint.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4RtpHint.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Sample.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Sample.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SampleDescription.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SampleDescription.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SampleEntry.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SampleEntry.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SampleTable.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SampleTable.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SchmAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SchmAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SdpAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SdpAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SLConfigDescriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SLConfigDescriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SmhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SmhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4StcoAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4StcoAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4StscAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4StscAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4StsdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4StsdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4StssAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4StssAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4StszAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4StszAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SttsAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SttsAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4SyntheticSampleTable.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4SyntheticSampleTable.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4TimsAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4TimsAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4TkhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4TkhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Track.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Track.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4TrakAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4TrakAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4TrefTypeAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4TrefTypeAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Types.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Types.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4UnknownDescriptor.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4UnknownDescriptor.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4UrlAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4UrlAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4Utils.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4Utils.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Core\Ap4VmhdAtom.h">

-      <Filter>AP4\Source\Core</Filter>

+    <ClInclude Include="AP4\Core\Ap4VmhdAtom.h">

+      <Filter>AP4\Core</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Crypto\Ap4AesBlockCipher.h">

-      <Filter>AP4\Source\Crypto</Filter>

+    <ClInclude Include="AP4\Crypto\Ap4AesBlockCipher.h">

+      <Filter>AP4\Crypto</Filter>

     </ClInclude>

-    <ClInclude Include="AP4\Source\Crypto\Ap4StreamCipher.h">

-      <Filter>AP4\Source\Crypto</Filter>

+    <ClInclude Include="AP4\Crypto\Ap4StreamCipher.h">

+      <Filter>AP4\Crypto</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>