diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-25 14:30:56 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-25 14:30:56 +0400 |
commit | b98950311e0d4876f08001aee30e95710260324e (patch) | |
tree | 967a76174bf283b0afc072e571abf292f0881024 /src/filters/parser | |
parent | b77331e97a8983fecc23e6f8a0936628a060c444 (diff) |
legacy branch: merge changes from trunk 2622-2626, updated apps project files
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2627 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser')
-rw-r--r-- | src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h | 2 | ||||
-rw-r--r-- | src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h index 16b5c1bf2..d36da3ae1 100644 --- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h +++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h @@ -290,6 +290,8 @@ const AP4_Atom::Type AP4_ATOM_TYPE_MJPG = AP4_ATOM_TYPE('M','J','P','G'); const AP4_Atom::Type AP4_ATOM_TYPE_RPZA = AP4_ATOM_TYPE('r','p','z','a');
const AP4_Atom::Type AP4_ATOM_TYPE_DVC = AP4_ATOM_TYPE('d','v','c',' ');
+const AP4_Atom::Type AP4_ATOM_TYPE_DIV3 = AP4_ATOM_TYPE('D','I','V','3');
+
/*----------------------------------------------------------------------
| AP4_AtomListInspector
+---------------------------------------------------------------------*/
diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp index 9c5f29382..dc14c9cfb 100644 --- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp +++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp @@ -399,6 +399,7 @@ AP4_AtomFactory::CreateAtomFromStream(AP4_ByteStream& stream, case AP4_ATOM_TYPE_MJPG:
case AP4_ATOM_TYPE_RPZA:
case AP4_ATOM_TYPE_DVC:
+ case AP4_ATOM_TYPE_DIV3:
atom = DNew AP4_VisualSampleEntry(type, size, stream, *this);
break;
|