[vlc-commits] MP4: recognize 3gp4 brand in debug

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 11 12:21:19 2011 +0200| [167a895edaab5cf7f096f8d99e43ceddcd7df604] | committer: Jean-Baptiste Kempf

MP4: recognize 3gp4 brand in debug

3gp4 is not compatible to isom, while 5, 6 and 7 should be
Ref #4979

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=167a895edaab5cf7f096f8d99e43ceddcd7df604
---

 modules/demux/mp4/libmp4.h |    1 +
 modules/demux/mp4/mp4.c    |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 777792d..5e2181a 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -96,6 +96,7 @@
 #define FOURCC_rtp  VLC_FOURCC( 'r', 't', 'p', ' ' )
 
 #define FOURCC_isom VLC_FOURCC( 'i', 's', 'o', 'm' )
+#define FOURCC_3gp4 VLC_FOURCC( '3', 'g', 'p', '4' )
 #define FOURCC_esds VLC_FOURCC( 'e', 's', 'd', 's' )
 
 #define FOURCC__mp3 VLC_FOURCC( '.', 'm', 'p', '3' )
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index b658ca7..be2ea2a 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -334,6 +334,9 @@ static int Open( vlc_object_t * p_this )
                          "ISO Media file (isom) version %d.",
                          p_ftyp->data.p_ftyp->i_minor_version );
                 break;
+            case( FOURCC_3gp4 ):
+                msg_Dbg( p_demux, "3gp Media file version 4" );
+                break;
             default:
                 msg_Dbg( p_demux,
                          "unrecognized major file specification (%4.4s).",