diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 06:04:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-10 21:55:41 +0200 |
| commit | 8713b8e3fb76c64cdeedeb36caa7b4703824ba7e (patch) | |
| tree | eb61ac23df0c6223d048d9e5a5213856253d5b45 | |
| parent | 714dd84f204fa210d7a727879ad6d7c4452e0bf8 (diff) | |
| download | ffmpeg-8713b8e3fb76c64cdeedeb36caa7b4703824ba7e.tar.gz | |
avformat/mux: Check for and remove invalid packet durations
Fixes assertion failure
Fixes Ticket3575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 649b4961d9..72ac40ddc8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -410,6 +410,12 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) av_dlog(s, "compute_pkt_fields2: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); + if (pkt->duration < 0 && st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) { + av_log(s, AV_LOG_WARNING, "Packet with invalid duration %d in stream %d\n", + pkt->duration, pkt->stream_index); + pkt->duration = 0; + } + /* duration field */ if (pkt->duration == 0) { ff_compute_frame_duration(&num, &den, st, NULL, pkt); |