Skip to content

F
ffmpeg-mt
Commit 66a4558b authored by bcoudurier's avatar bcoudurier
Browse files
Options

change 3gp/3g2 brands if h264 is present 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13771 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4c35802f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavformat/movenc.c
View file @ 66a4558b
...@@ -1393,9 +1393,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) ...@@ -1393,9 +1393,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
put_tag(pb, "ftyp"); put_tag(pb, "ftyp");
if (mov->mode == MODE_3GP) if (mov->mode == MODE_3GP)
put_tag(pb, "3gp4"); put_tag(pb, has_h264 ? "3gp6":"3gp4");
else if (mov->mode & MODE_3G2) else if (mov->mode & MODE_3G2)
put_tag(pb, "3g2a"); put_tag(pb, has_h264 ? "3g2b":"3g2a");
else if (mov->mode == MODE_PSP) else if (mov->mode == MODE_PSP)
put_tag(pb, "MSNV"); put_tag(pb, "MSNV");
else if (mov->mode == MODE_MP4) else if (mov->mode == MODE_MP4)
...@@ -1415,9 +1415,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s) ...@@ -1415,9 +1415,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
} }
if (mov->mode == MODE_3GP) if (mov->mode == MODE_3GP)
put_tag(pb, "3gp4"); put_tag(pb, has_h264 ? "3gp6":"3gp4");
else if (mov->mode & MODE_3G2) else if (mov->mode & MODE_3G2)
put_tag(pb, "3g2a"); put_tag(pb, has_h264 ? "3g2b":"3g2a");
else if (mov->mode == MODE_PSP) else if (mov->mode == MODE_PSP)
put_tag(pb, "MSNV"); put_tag(pb, "MSNV");
else if (mov->mode == MODE_MP4) else if (mov->mode == MODE_MP4)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment