little h.264 related hunk from diff between cvs and mobile hackerz

Originally committed as revision 5268 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 41e4d6d747d92e5c6e42b564b9e192287db180aa..66686ea1a5b2061e31d3b384aec2130bf9c010d2 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1546,8 +1546,15 @@ static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s)
     put_tag(pb, "VPRF");   /* video */
     put_be32(pb, 0x0 );
     put_be32(pb, 0x1 );    /* TrackID */
-    put_tag(pb, "mp4v");
-    put_be32(pb, 0x103 );
+    if (VideoCodec->codec_id == CODEC_ID_H264) {
+        put_tag(pb, "avc1");
+        put_be16(pb, 0x014D );
+        put_be16(pb, 0x0015 );
+    } else {
+        put_tag(pb, "mp4v");
+        put_be16(pb, 0x0000 );
+        put_be16(pb, 0x0103 );
+    }
     put_be32(pb, 0x0 );
     put_be32(pb, video_kbitrate);
     put_be32(pb, video_kbitrate);