add support for png,8bps,3iv1,3iv2 in MOV

Patch by v0lt

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

2 files changed, 9 insertions, 3 deletions

diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
index d36da3ae1..5db2d8ce0 100644
--- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
@@ -282,6 +282,7 @@ const AP4_Atom::Type AP4_ATOM_TYPE_DTSH = AP4_ATOM_TYPE('d','t','s','h');
 const AP4_Atom::Type AP4_ATOM_TYPE_DTSL = AP4_ATOM_TYPE('d','t','s','l');

 const AP4_Atom::Type AP4_ATOM_TYPE_RAW  = AP4_ATOM_TYPE('r','a','w',' ');

 const AP4_Atom::Type AP4_ATOM_TYPE_JPEG = AP4_ATOM_TYPE('j','p','e','g');

+const AP4_Atom::Type AP4_ATOM_TYPE_PNG  = AP4_ATOM_TYPE('p','n','g',' ');

 const AP4_Atom::Type AP4_ATOM_TYPE_ALAW = AP4_ATOM_TYPE('a','l','a','w');

 const AP4_Atom::Type AP4_ATOM_TYPE_ULAW = AP4_ATOM_TYPE('u','l','a','w');

 const AP4_Atom::Type AP4_ATOM_TYPE_RLE  = AP4_ATOM_TYPE('r','l','e',' ');

@@ -289,9 +290,10 @@ const AP4_Atom::Type AP4_ATOM_TYPE_MJPA = AP4_ATOM_TYPE('m','j','p','a');
 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');

-

+const AP4_Atom::Type AP4_ATOM_TYPE_8BPS = AP4_ATOM_TYPE('8','B','P','S');

+const AP4_Atom::Type AP4_ATOM_TYPE_3IV1 = AP4_ATOM_TYPE('3','I','V','1');

+const AP4_Atom::Type AP4_ATOM_TYPE_3IV2 = AP4_ATOM_TYPE('3','I','V','2');

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

 |       AP4_AtomListInspector

 +---------------------------------------------------------------------*/

diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
index a839a0b99..9a3d66a6a 100644
--- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
@@ -395,12 +395,16 @@ AP4_AtomFactory::CreateAtomFromStream(AP4_ByteStream& stream,
 	  case AP4_ATOM_TYPE_H263:

       case AP4_ATOM_TYPE_S263:

 	  case AP4_ATOM_TYPE_JPEG:

+	  case AP4_ATOM_TYPE_PNG:

       case AP4_ATOM_TYPE_RLE:

 	  case AP4_ATOM_TYPE_MJPA:

 	  case AP4_ATOM_TYPE_MJPG:

 	  case AP4_ATOM_TYPE_RPZA:

 	  case AP4_ATOM_TYPE_DVC:

-		case AP4_ATOM_TYPE_DIV3:

+	  case AP4_ATOM_TYPE_DIV3:

+	  case AP4_ATOM_TYPE_8BPS:

+	  case AP4_ATOM_TYPE_3IV1:

+	  case AP4_ATOM_TYPE_3IV2:

         atom = DNew AP4_VisualSampleEntry(type, size, stream, *this);

         break;