diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2014-03-03 18:53:43 +0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-10 00:58:28 +0400 |
| commit | eabefe83f40a65d0f0c2a9a0521f6d96c3932545 (patch) | |
| tree | ba60dea6260cfd49f42dd66e0e4a302f208c3e93 /libavformat | |
| parent | eaa79b79b25ac0ceaf44fe575a3ae724b87285b2 (diff) | |
movenc: allow muxing HEVC in MODE_MP4.
(cherry picked from commit 4f3db5d3418a24f3b90422e98ad75388052c4284)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/movenc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index a6197aba02..76c455b863 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -33,6 +33,7 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_MOV_TEXT , 0x08 }, { AV_CODEC_ID_MPEG4 , 0x20 }, { AV_CODEC_ID_H264 , 0x21 }, + { AV_CODEC_ID_HEVC , 0x23 }, { AV_CODEC_ID_AAC , 0x40 }, { AV_CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */ { AV_CODEC_ID_MPEG2VIDEO , 0x61 }, /* MPEG2 Main */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6218259664..2ae3475c17 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -752,6 +752,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) return 0; if (track->enc->codec_id == AV_CODEC_ID_H264) tag = MKTAG('a','v','c','1'); + else if (track->enc->codec_id == AV_CODEC_ID_HEVC) tag = MKTAG('h','e','v','1'); else if (track->enc->codec_id == AV_CODEC_ID_AC3) tag = MKTAG('a','c','-','3'); else if (track->enc->codec_id == AV_CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); else if (track->enc->codec_id == AV_CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); |