diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:05:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:05:53 +0100 |
| commit | 30099413ecf667f5972edd3ddeb49503b0823e70 (patch) | |
| tree | 4b2dea902f53f00b0a92158aaba0aa4de4c87686 | |
| parent | 186e0ff067c458df4358f57c71504ada26d1b18a (diff) | |
| parent | eabefe83f40a65d0f0c2a9a0521f6d96c3932545 (diff) | |
| download | ffmpeg-30099413ecf667f5972edd3ddeb49503b0823e70.tar.gz | |
Merge commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545' into release/2.2
* commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545':
movenc: allow muxing HEVC in MODE_MP4.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 b7f8fa9c80..957ee5b276 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 a5e6b0d8cb..b917a59fb5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -839,6 +839,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'); |