summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-06-13 12:19:01 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-06-13 12:19:01 +0000
commited6e47c21d4a419c986e249dc87e253177bba754 (patch)
treee12fa6307a299710b6f82eff5d805487fceed6a7 /libavformat/movenc.c
parent1560b667143c321d1baaa784e4cfe9f01bd796b6 (diff)
Add isom to the compatible brands.
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5337c120b9..bd84f9be06 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1404,6 +1404,10 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
put_be32(pb, 0x200);
+ if(mov->mode != MODE_MOV){
+ put_tag(pb, "isom");
+ }
+
if (mov->mode == MODE_3GP)
put_tag(pb, "3gp4");
else if (mov->mode & MODE_3G2)
@@ -1412,9 +1416,7 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
put_tag(pb, "MSNV");
else if (mov->mode == MODE_MP4)
put_tag(pb, "mp41");
- else if (mov->mode == MODE_IPOD)
- put_tag(pb, "isom");
- else
+ else if(mov->mode == MODE_MOV)
put_tag(pb, "qt ");
return updateSize(pb, pos);
}