generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: Support HEVC demuxing

Browse Source
This commit is contained in:
Yusuke Nakamura 2013-10-03 14:34:53 +09:00 committed by Anton Khirnov
parent ea29f965dc
commit 959bea13ce
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -42,7 +42,7 @@ version 10:
- F4V muxer - F4V muxer
- HNM version 4 demuxer and video decoder - HNM version 4 demuxer and video decoder
- HEVC decoder - HEVC decoder
- raw HEVC, HEVC in MOV/MP4 demuxing - raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing
version 9: version 9:

1
libavformat/matroska.c
View File

@ -70,6 +70,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},

3
libavformat/matroskadec.c
View File

@ -1693,7 +1693,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);
if (st->codec->codec_id != AV_CODEC_ID_H264) if (st->codec->codec_id != AV_CODEC_ID_H264 &&
st->codec->codec_id != AV_CODEC_ID_HEVC)
st->need_parsing = AVSTREAM_PARSE_HEADERS; 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,

2
libavformat/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 9 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \