[FFmpeg-cvslog] movenc: allow muxing HEVC in MODE_MP4.

[Tim Walker]

ffmpeg | branch: release/2.2 | Tim Walker <tdskywalker at gmail.com> | Mon Mar  3 14:53:43 2014 +0000| [eabefe83f40a65d0f0c2a9a0521f6d96c3932545] | committer: Reinhard Tartler

movenc: allow muxing HEVC in MODE_MP4.

(cherry picked from commit 4f3db5d3418a24f3b90422e98ad75388052c4284)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eabefe83f40a65d0f0c2a9a0521f6d96c3932545
---

 libavformat/isom.c   |    1 +
 libavformat/movenc.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/libavformat/isom.c b/libavformat/isom.c
index a6197ab..76c455b 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 6218259..2ae3475 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');