Browse code

Merge commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545' into release/2.2

* commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545':
movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/03/11 20:05:53
Showing 2 changed files
... ...
@@ -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 */
... ...
@@ -839,6 +839,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)
839 839
         return 0;
840 840
 
841 841
     if      (track->enc->codec_id == AV_CODEC_ID_H264)      tag = MKTAG('a','v','c','1');
842
+    else if (track->enc->codec_id == AV_CODEC_ID_HEVC)      tag = MKTAG('h','e','v','1');
842 843
     else if (track->enc->codec_id == AV_CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');
843 844
     else if (track->enc->codec_id == AV_CODEC_ID_DIRAC)     tag = MKTAG('d','r','a','c');
844 845
     else if (track->enc->codec_id == AV_CODEC_ID_MOV_TEXT)  tag = MKTAG('t','x','3','g');