diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-14 21:10:11 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-14 21:10:11 +0000 |
| commit | 3473ca9a250f46d58e0d0e358ef9e5327f1e4f1d (patch) | |
| tree | d7abf4041906e9e6fff77df1f5ac5fb5a50c90e0 /libavformat/movenc.c | |
| parent | cd70d17f5f622feee4b3980c24ea768a489e2f3e (diff) | |
change 3gp/3g2 brands if h264 is present
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index fd15370331..c2d34956e8 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1393,9 +1393,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) 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 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) } 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) |