From 7a5356c7281d39ee168bfa984ae081969e47da27 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 18 Mar 2015 20:35:26 +0100 Subject: [PATCH] lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does. This change allows remuxing hevc from mpeg-ts to Matroska. --- libavformat/matroskaenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index be4d689bfe..40f903b68f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -605,8 +605,9 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, return ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); case AV_CODEC_ID_HEVC: - return ff_isom_write_hvcc(dyn_cp, codec->extradata, - codec->extradata_size, 0); + ff_isom_write_hvcc(dyn_cp, codec->extradata, + codec->extradata_size, 0); + return 0; case AV_CODEC_ID_ALAC: if (codec->extradata_size < 36) { av_log(s, AV_LOG_ERROR,