[FFmpeg-cvslog] matroskadec: Support HEVC demuxing

[Yusuke Nakamura]

ffmpeg | branch: master | Yusuke Nakamura <muken.the.vfrmaniac at gmail.com> | Thu Oct  3 14:34:53 2013 +0900| [959bea13ce3498a5bddf8a415a061a7bb5a8b075] | committer: Anton Khirnov

matroskadec: Support HEVC demuxing

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=959bea13ce3498a5bddf8a415a061a7bb5a8b075
---

 Changelog                 |    2 +-
 libavformat/matroska.c    |    1 +
 libavformat/matroskadec.c |    5 +++--
 libavformat/version.h     |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 4935cc5..07c510d 100644
--- a/Changelog
+++ b/Changelog
@@ -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:
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 7976be0..410e2f4 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -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},
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e6c9adf..f798342 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -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);
diff --git a/libavformat/version.h b/libavformat/version.h
index d4752a9..148e66e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -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, \