diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 06:14:03 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 06:14:03 +0400 |
| commit | d130fae51948a2baf69dcf29fdb15f80ea2bc363 (patch) | |
| tree | f2cbbcc131a41abdcb3178e84ba6df873dc242c4 /libavformat | |
| parent | dde996bf999a2b4ec155e78a7b6b1cd66830fb9d (diff) | |
| parent | daaef403d122b35d87b27d6b369d287b1ed06973 (diff) | |
Merge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2
* commit 'daaef403d122b35d87b27d6b369d287b1ed06973':
matroskaenc: write private data in hvcC format for HEVC.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 65845c7921..7b2bbed6da 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -203,7 +203,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ isom.o rmsipr.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ - isom.o avc.o \ + isom.o avc.o hevc.o \ flacenc_header.o avlanguage.o wv.o OBJS-$(CONFIG_MD5_MUXER) += md5enc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 50f4dfa51c..a2f402edcd 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -22,6 +22,7 @@ #include <stdint.h> #include "avc.h" +#include "hevc.h" #include "avformat.h" #include "avio_internal.h" #include "avlanguage.h" @@ -532,6 +533,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo ret = put_wv_codecpriv(dyn_cp, codec); else if (codec->codec_id == AV_CODEC_ID_H264) ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); + else if (codec->codec_id == AV_CODEC_ID_HEVC) + ret = ff_isom_write_hvcc(dyn_cp, codec->extradata, codec->extradata_size, 0); else if (codec->codec_id == AV_CODEC_ID_ALAC) { if (codec->extradata_size < 36) { av_log(s, AV_LOG_ERROR, |