diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:34:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:34:17 +0100 |
| commit | 38aee6408a6732b8ac86341dabf6683c08caa1c1 (patch) | |
| tree | 90fa9045b65094f6c450b609e04b7cc6bfa9bf57 | |
| parent | 88c8e4afeaf74ee58b67145e0331e229d8050968 (diff) | |
| parent | a823d0948683bd97dd58556b5740e434166209a8 (diff) | |
| download | ffmpeg-38aee6408a6732b8ac86341dabf6683c08caa1c1.tar.gz | |
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'
* commit 'a823d0948683bd97dd58556b5740e434166209a8':
matroskaenc: write private data in hvcC format for HEVC.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 d3cf8efdda..fa8a9b57ed 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, |