Module: libav Branch: release/10 Commit: daaef403d122b35d87b27d6b369d287b1ed06973
Author: Tim Walker <[email protected]> Committer: Tim Walker <[email protected]> Date: Mon Mar 3 14:53:44 2014 +0000 matroskaenc: write private data in hvcC format for HEVC. (cherry picked from commit a823d0948683bd97dd58556b5740e434166209a8) --- libavformat/Makefile | 2 +- libavformat/matroskaenc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index a3cd504..5694314 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -168,7 +168,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_MJPEG_DEMUXER) += rawdec.o diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3ab3139..3cb7eef 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 "avlanguage.h" #include "flacenc.h" @@ -500,6 +501,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, _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
