summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2014-03-03 14:53:43 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-09 18:09:40 +0100
commit4f3db5d3418a24f3b90422e98ad75388052c4284 (patch)
treeca03f0018c037e1a67544853d6fc51ccee84a862 /libavformat/isom.c
parentb6c61fb83e876d404ac3b0b3657ebfcafdcd1926 (diff)
movenc: allow muxing HEVC in MODE_MP4.
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 19d629110f..b3f3f95ca0 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 */