diff options
| author | Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> | 2013-10-12 11:55:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 00:17:28 +0200 |
| commit | 16b6839de6767924c4640d6e9204b6eeb5c53910 (patch) | |
| tree | 93a733b57fa01276460f036e3e3f7fe750472837 /libavformat | |
| parent | 53f903b7c5427cb18659f7775714e860c1c5fc39 (diff) | |
| download | ffmpeg-16b6839de6767924c4640d6e9204b6eeb5c53910.tar.gz | |
lavf/matroskadec: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 10d11a3cfb..77a88a8756 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -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}, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8ed3b93386..52e095f447 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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); |