[vlc-commits] commit: mp4: add avc1/3gp6/qt brands (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Jun 13 15:20:54 2010 +0300| [116a88f6d35589008750c666ae3b0c09b2926e0d] | committer: Ilkka Ollakka 

mp4: add avc1/3gp6/qt  brands

I think this should be safe even if there isn't avc1 track
(cherry picked from commit abfcb0302d9b28f3d9e09f4e4272fc522b9ef3e1)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=116a88f6d35589008750c666ae3b0c09b2926e0d
---

 modules/mux/mp4.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 7b9ba4c..3d59c3c 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -206,11 +206,13 @@ static int Open( vlc_object_t *p_this )
     {
         /* Now add ftyp header */
         box = box_new( "ftyp" );
-        if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp4" );
+        if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp6" );
         else bo_add_fourcc( box, "isom" );
         bo_add_32be  ( box, 0 );
         if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp4" );
         else bo_add_fourcc( box, "mp41" );
+        bo_add_fourcc( box, "avc1" );
+        bo_add_fourcc( box, "qt  " );
         box_fix( box );
 
         p_sys->i_pos += box->i_buffer;