diff options
| author | Baptiste Coudurier <baptiste.coudurier@smartjog.com> | 2006-03-02 19:28:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-03-02 19:28:35 +0000 |
| commit | 26f86eaf03be9acf95676f67897b75f7f0c40238 (patch) | |
| tree | 43e6eb5cf1e694978b00715a6a960ae7bc1a517d /libavformat/movenc.c | |
| parent | b72a2bc82f0ce8e4299b7ee049cdaecbe4888550 (diff) | |
| download | ffmpeg-26f86eaf03be9acf95676f67897b75f7f0c40238.tar.gz | |
ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5098 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5a00971154..8dfe04c04a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1316,8 +1316,10 @@ static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s) put_tag(pb, "3g2a"); else if ( mov->mode == MODE_PSP ) put_tag(pb, "MSNV"); - else + else if ( mov->mode == MODE_MP4 ) put_tag(pb, "isom"); + else + put_tag(pb, "qt "); put_be32(pb, 0x200 ); @@ -1327,8 +1329,10 @@ static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s) put_tag(pb, "3g2a"); else if ( mov->mode == MODE_PSP ) put_tag(pb, "MSNV"); - else + else if ( mov->mode == MODE_MP4 ) put_tag(pb, "mp41"); + else + put_tag(pb, "qt "); } static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s) @@ -1398,9 +1402,7 @@ static int mov_write_header(AVFormatContext *s) else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP; - if ( mov->mode == MODE_3GP || mov->mode == MODE_3G2 || - mov->mode == MODE_MP4 || mov->mode == MODE_PSP ) - mov_write_ftyp_tag(pb,s); + mov_write_ftyp_tag(pb,s); if ( mov->mode == MODE_PSP ) { if ( s->nb_streams != 2 ) { av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n"); |