diff options
| author | James Zern <jzern@google.com> | 2011-05-26 20:19:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-26 22:00:40 +0200 |
| commit | 094aa84b03632370dde171935171321bbfa9548b (patch) | |
| tree | 85208e5b14588fd3e2d264074c453bd24112d87f /libavformat/utils.c | |
| parent | 2b6bfff2b21f07c5455ef873cc9331a1b7fbf83c (diff) | |
| download | ffmpeg-094aa84b03632370dde171935171321bbfa9548b.tar.gz | |
muxers: Add a flag to mark muxers that allow (non strict) monotone timestamps.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3c9a89dc64..3432b2269f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2993,7 +2993,7 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){ pkt->dts= st->pts_buffer[0]; } - if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){ + if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)){ av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %"PRId64" >= %"PRId64"\n", st->index, st->cur_dts, pkt->dts); |