From: Yusuke Nakamura <[email protected]>
---
libavformat/matroska.c | 1 +
libavformat/matroskadec.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 7976be0..410e2f4 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -70,6 +70,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},
+ {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},
{"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
{"V_PRORES" , AV_CODEC_ID_PRORES},
{"V_REAL/RV10" , AV_CODEC_ID_RV10},
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e6c9adf..cf18655 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1693,8 +1693,8 @@ static int matroska_read_header(AVFormatContext *s)
st->codec->height * track->video.display_width,
st->codec-> width * track->video.display_height,
255);
- if (st->codec->codec_id != AV_CODEC_ID_H264)
- st->need_parsing = AVSTREAM_PARSE_HEADERS;
+ if (st->codec->codec_id != AV_CODEC_ID_H264 && st->codec->codec_id
!= AV_CODEC_ID_HEVC)
+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
if (track->default_duration) {
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
1000000000, track->default_duration, 30000);
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
