diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 15:04:47 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 15:04:47 +0200 |
commit | 0966623604a92bc7fa6213e7dfb9c03d007ab3e9 (patch) | |
tree | 26c1dfc9ae941810fdd9af347c73f02d574ea8cb /ffmpeg.c | |
parent | af2d96433624d4083bd94083a2ef8aaa5f42c3a2 (diff) | |
download | ffmpeg-0966623604a92bc7fa6213e7dfb9c03d007ab3e9.tar.gz |
ffmpeg: drop old non monotone dts workaround.
All bugs should now be fixed in the new so the old can be droped.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -599,17 +599,6 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost) bsfc = bsfc->next; } - if ((avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) && pkt->dts != AV_NOPTS_VALUE) { - int64_t max = ost->st->cur_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); - if (ost->st->cur_dts && ost->st->cur_dts != AV_NOPTS_VALUE && max > pkt->dts) { - av_log(s, max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG, - "st:%d PTS: %"PRId64" DTS: %"PRId64" < %"PRId64" invalid, clipping\n", pkt->stream_index, pkt->pts, pkt->dts, max); - if(pkt->pts >= pkt->dts) - pkt->pts = FFMAX(pkt->pts, max); - pkt->dts = max; - } - } - if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) && (avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) && pkt->dts != AV_NOPTS_VALUE && |