[FFmpeg-cvslog] r13771 - trunk/libavformat/movenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat Jun 14 23:10:11 2008
New Revision: 13771

Log:
change 3gp/3g2 brands if h264 is present

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Sat Jun 14 23:10:11 2008
@@ -1393,9 +1393,9 @@ static int mov_write_ftyp_tag(ByteIOCont
     put_tag(pb, "ftyp");
 
     if (mov->mode == MODE_3GP)
-        put_tag(pb, "3gp4");
+        put_tag(pb, has_h264 ? "3gp6":"3gp4");
     else if (mov->mode & MODE_3G2)
-        put_tag(pb, "3g2a");
+        put_tag(pb, has_h264 ? "3g2b":"3g2a");
     else if (mov->mode == MODE_PSP)
         put_tag(pb, "MSNV");
     else if (mov->mode == MODE_MP4)
@@ -1415,9 +1415,9 @@ static int mov_write_ftyp_tag(ByteIOCont
     }
 
     if (mov->mode == MODE_3GP)
-        put_tag(pb, "3gp4");
+        put_tag(pb, has_h264 ? "3gp6":"3gp4");
     else if (mov->mode & MODE_3G2)
-        put_tag(pb, "3g2a");
+        put_tag(pb, has_h264 ? "3g2b":"3g2a");
     else if (mov->mode == MODE_PSP)
         put_tag(pb, "MSNV");
     else if (mov->mode == MODE_MP4)