(cherry picked from commit 4f3db5d3418a24f3b90422e98ad75388052c4284)
Tim Walker authored on 2014/03/03 23:53:43... | ... |
@@ -33,6 +33,7 @@ const AVCodecTag ff_mp4_obj_type[] = { |
33 | 33 |
{ AV_CODEC_ID_MOV_TEXT , 0x08 }, |
34 | 34 |
{ AV_CODEC_ID_MPEG4 , 0x20 }, |
35 | 35 |
{ AV_CODEC_ID_H264 , 0x21 }, |
36 |
+ { AV_CODEC_ID_HEVC , 0x23 }, |
|
36 | 37 |
{ AV_CODEC_ID_AAC , 0x40 }, |
37 | 38 |
{ AV_CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */ |
38 | 39 |
{ AV_CODEC_ID_MPEG2VIDEO , 0x61 }, /* MPEG2 Main */ |
... | ... |
@@ -752,6 +752,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) |
752 | 752 |
return 0; |
753 | 753 |
|
754 | 754 |
if (track->enc->codec_id == AV_CODEC_ID_H264) tag = MKTAG('a','v','c','1'); |
755 |
+ else if (track->enc->codec_id == AV_CODEC_ID_HEVC) tag = MKTAG('h','e','v','1'); |
|
755 | 756 |
else if (track->enc->codec_id == AV_CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); |
756 | 757 |
else if (track->enc->codec_id == AV_CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); |
757 | 758 |
else if (track->enc->codec_id == AV_CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); |