Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:57:57 +0000 (17:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:57:57 +0000 (17:57 +0100)
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h

See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/matroskadec.c
libavformat/version.h

index 968e65c..dfb17b0 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -49,8 +49,8 @@ version 2.1:
 - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support)
 - Linux framebuffer output device
 - HEVC decoder
-- raw HEVC, HEVC in MOV/MP4 demuxing
-- HEVC demuxing in TS, Matroska
+- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing
+- HEVC demuxing in TS
 - mergeplanes filter
 
 
index 52e095f..f770d67 100644 (file)
@@ -1845,6 +1845,7 @@ static int matroska_read_header(AVFormatContext *s)
                       255);
             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);
index ff1b670..99d6444 100644 (file)
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
 #define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO 102
+#define LIBAVFORMAT_VERSION_MICRO 103
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \