summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-04-04 17:44:59 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-04-04 17:44:59 +0000
commit87b041e0f099e5ae2d0ba2d2ebb7c9963b26ac54 (patch)
tree1fc158a4431643fd2b12b7f5554e9368084035d9 /libavformat/movenc.c
parent9e282ba38279d961ee6970ae89cd5bb25aa4caf8 (diff)
little h.264 related hunk from diff between cvs and mobile hackerz
Originally committed as revision 5268 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 41e4d6d747..66686ea1a5 100644
--- 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);