diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-09-04 00:50:11 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-03 13:48:05 +0200 |
| commit | c6ee2f7c90aadf200eba53508f3fe15bc25e0c82 (patch) | |
| tree | bfcc34236fad79c3b1985e71d95002015d37e21b | |
| parent | b9b845e98a6692ce85d7cfd51a8717817ee309a1 (diff) | |
| download | ffmpeg-c6ee2f7c90aadf200eba53508f3fe15bc25e0c82.tar.gz | |
avformat/matroskadec: Fix handling gigantic durations
matroska_parse_block currently asserts that the duration is not equal to
AV_NOPTS_VALUE, but there is nothing that actually guarantees this. It
is easy to create (spec-compliant) files which run into this assert;
so replace it and instead cap the duration to INT64_MAX, as the duration
field of an AVPacket is an int64_t.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 3714d452b894821591a2fbafdd1b8ef15abe4be6)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 9f03f8c0df..401139e27c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3279,7 +3279,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, st = track->stream; if (st->discard >= AVDISCARD_ALL) return res; - av_assert1(block_duration != AV_NOPTS_VALUE); + if (block_duration > INT64_MAX) + block_duration = INT64_MAX; block_time = sign_extend(AV_RB16(data), 16); data += 2; |