Skip to content

F
ffmpeg.wasm-core
Commit 16b6839d authored by Yusuke Nakamura's avatar Yusuke Nakamura Committed by Michael Niedermayer
Browse files
Options

lavf/matroskadec: Support HEVC demuxing. 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 53f903b7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
libavformat/matroska.c
View file @ 16b6839d
...@@ -88,6 +88,7 @@ const CodecTags ff_mkv_codec_tags[]={ ...@@ -88,6 +88,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4}, {"V_MPEG4/ISO/AP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4}, {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264}, {"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_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
{"V_PRORES" , AV_CODEC_ID_PRORES}, {"V_PRORES" , AV_CODEC_ID_PRORES},
{"V_REAL/RV10" , AV_CODEC_ID_RV10}, {"V_REAL/RV10" , AV_CODEC_ID_RV10},
......
libavformat/matroskadec.c
View file @ 16b6839d
...@@ -1843,7 +1843,8 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1843,7 +1843,8 @@ static int matroska_read_header(AVFormatContext *s)
st->codec->height * track->video.display_width, st->codec->height * track->video.display_width,
st->codec-> width * track->video.display_height, st->codec-> width * track->video.display_height,
255); 255);
st->need_parsing = AVSTREAM_PARSE_HEADERS; if (st->codec->codec_id != AV_CODEC_ID_HEVC)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
if (track->default_duration) { if (track->default_duration) {
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
1000000000, track->default_duration, 30000); 1000000000, track->default_duration, 30000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment