summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog4
-rw-r--r--libavformat/matroskadec.c1
-rw-r--r--libavformat/version.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 968e65c85c..dfb17b0f7d 100644
--- 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
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 52e095f447..f770d67af7 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -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);
diff --git a/libavformat/version.h b/libavformat/version.h
index ff1b67073d..99d64445ba 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -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, \