diff options
| author | Michael Niedermayer <[email protected]> | 2016-09-09 13:11:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2016-09-28 14:23:06 +0200 |
| commit | 21a979773783bb4e1baa2597150f25151328c93f (patch) | |
| tree | 02255b804d3810df69f4745672e6a2abc5d6a4de | |
| parent | 65c10f0f5c5212f903feb30a5f65700caa6f0b2e (diff) | |
avformat/movenc: Check first DTS similar to dts difference
Fixes assertion failure
Fixes: b84b53855a0b74560e64c6f45f505a13/signal_sigabrt_7ffff6ae7c37_3837_ef4e243ea5b4fa8d0becf4afe9166604.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 68f4c2163ec6d4534ae1756dbcf259845f2e4d2c)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/movenc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d614933dff..788ab3c4d9 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4612,6 +4612,13 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) pkt->dts = trk->cluster[trk->entry - 1].dts + 1; pkt->pts = AV_NOPTS_VALUE; } + } else if (pkt->dts <= INT_MIN || pkt->dts >= INT_MAX) { + av_log(s, AV_LOG_ERROR, "Application provided initial timestamp: %"PRId64" is out of range for mov/mp4 format\n", + pkt->dts + ); + + pkt->dts = 0; + pkt->pts = AV_NOPTS_VALUE; } if (pkt->duration < 0 || pkt->duration > INT_MAX) { av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is invalid\n", pkt->duration); |