Mercurial > libavformat.hg

changeset 3473:87259205d376 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change 3gp/3g2 brands if h264 is present
author bcoudurier
date Sat, 14 Jun 2008 21:10:11 +0000
parents 0edcd0638ecc
children f4f6a7234040
files movenc.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/movenc.c	Sat Jun 14 21:07:59 2008 +0000
+++ b/movenc.c	Sat Jun 14 21:10:11 2008 +0000
@@ -1393,9 +1393,9 @@
     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 @@
     }
 
     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)