[FFmpeg-cvslog] ffmpeg: drop old non monotone dts workaround.

Michael Niedermayer git at videolan.org
Fri May 3 15:12:00 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 15:04:47 2013 +0200| [0966623604a92bc7fa6213e7dfb9c03d007ab3e9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0966623604a92bc7fa6213e7dfb9c03d007ab3e9
---

 ffmpeg.c |   11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index ea5c581..33152c1 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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 &&



More information about the ffmpeg-cvslog mailing list