diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:57:57 +0100 |
| commit | 0fbeeb939915b69050d00feab93aa904d133ec5f (patch) | |
| tree | 410d9d0778c11108f4851655611c55753a4c711b /libavformat/matroskadec.c | |
| parent | 3a0c90263605f5cd7992e40d5b91a418621f623f (diff) | |
| parent | 959bea13ce3498a5bddf8a415a061a7bb5a8b075 (diff) | |
| download | ffmpeg-0fbeeb939915b69050d00feab93aa904d133ec5f.tar.gz | |
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
matroskadec: Support HEVC demuxing
Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h
See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |