mirror of https://git.ffmpeg.org/ffmpeg.git
change 3gp/3g2 brands if h264 is present
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
cd70d17f5f
commit
3473ca9a25
|
@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
|
|
Loading…
Reference in New Issue