mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
lavf/matroskadec: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
53f903b7c5
commit
16b6839de6
@ -88,6 +88,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},
|
||||
|
@ -1843,7 +1843,8 @@ static int matroska_read_header(AVFormatContext *s)
|
||||
st->codec->height * track->video.display_width,
|
||||
st->codec-> width * track->video.display_height,
|
||||
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) {
|
||||
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
|
||||
1000000000, track->default_duration, 30000);
|
||||
|
Loading…
Reference in New Issue
Block a user