mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-15 11:44:49 +00:00
put avc1 brand in compat list when h264 is present
Originally committed as revision 13768 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5171fd9dd5
commit
835790846c
@ -1378,8 +1378,15 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
|
|||||||
{
|
{
|
||||||
MOVContext *mov = s->priv_data;
|
MOVContext *mov = s->priv_data;
|
||||||
offset_t pos = url_ftell(pb);
|
offset_t pos = url_ftell(pb);
|
||||||
|
int has_h264 = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < s->nb_streams; i++) {
|
||||||
|
AVStream *st = s->streams[i];
|
||||||
|
if (st->codec->codec_id == CODEC_ID_H264)
|
||||||
|
has_h264 = 1;
|
||||||
|
}
|
||||||
|
|
||||||
put_be32(pb, 0); /* size */
|
put_be32(pb, 0); /* size */
|
||||||
put_tag(pb, "ftyp");
|
put_tag(pb, "ftyp");
|
||||||
|
|
||||||
@ -1407,6 +1414,8 @@ static void mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
|
|||||||
if(mov->mode != MODE_MOV){
|
if(mov->mode != MODE_MOV){
|
||||||
put_tag(pb, "isom");
|
put_tag(pb, "isom");
|
||||||
put_tag(pb, "iso2");
|
put_tag(pb, "iso2");
|
||||||
|
if(has_h264)
|
||||||
|
put_tag(pb, "avc1");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mov->mode == MODE_3GP)
|
if (mov->mode == MODE_3GP)
|
||||||
|
Loading…
Reference in New Issue
Block a user