mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
matroskadec: Support HEVC demuxing
This commit is contained in:
parent
ea29f965dc
commit
959bea13ce
@ -42,7 +42,7 @@ version 10:
|
||||
- F4V muxer
|
||||
- HNM version 4 demuxer and video decoder
|
||||
- HEVC decoder
|
||||
- raw HEVC, HEVC in MOV/MP4 demuxing
|
||||
- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing
|
||||
|
||||
|
||||
version 9:
|
||||
|
@ -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},
|
||||
|
@ -1693,8 +1693,9 @@ 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);
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
#define LIBAVFORMAT_VERSION_MAJOR 55
|
||||
#define LIBAVFORMAT_VERSION_MINOR 9
|
||||
#define LIBAVFORMAT_VERSION_MICRO 1
|
||||
#define LIBAVFORMAT_VERSION_MICRO 2
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||
LIBAVFORMAT_VERSION_MINOR, \
|
||||
|
Loading…
Reference in New Issue
Block a user