aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroskaenc.c
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2014-03-03 14:53:44 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-09 18:09:40 +0100
commita823d0948683bd97dd58556b5740e434166209a8 (patch)
treebf75fbb659951c081a7f495560c544cc9090fe8e /libavformat/matroskaenc.c
parent4f3db5d3418a24f3b90422e98ad75388052c4284 (diff)
downloadffmpeg-a823d0948683bd97dd58556b5740e434166209a8.tar.gz
matroskaenc: write private data in hvcC format for HEVC.
Diffstat (limited to 'libavformat/matroskaenc.c')
-rw-r--r--libavformat/matroskaenc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3ab3139a29..3cb7eef25b 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,