[FFmpeg-cvslog] avformat: remove a workaround for broken timestamps

Justin Ruggles git at videolan.org
Sat May 5 00:58:06 CEST 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Apr 26 10:59:05 2012 -0400| [ff499157a11046a59f88646a2541bd6c170f1804] | committer: Justin Ruggles

avformat: remove a workaround for broken timestamps

This modifies pts in situations other than what was intended, leading to
invalid timestamps.

Reverts commit 90bb394dccacd10607153833a0aeba0d970dc8db

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

 libavformat/utils.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b167e96..31708cf 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -985,15 +985,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
                 }
             }
 
-            if(pkt->pts != AV_NOPTS_VALUE && duration){
-                int64_t old_diff= FFABS(st->cur_dts - duration - pkt->pts);
-                int64_t new_diff= FFABS(st->cur_dts - pkt->pts);
-                if(old_diff < new_diff && old_diff < (duration>>3)){
-                    pkt->pts += duration;
-    //                av_log(NULL, AV_LOG_DEBUG, "id:%d old:%"PRId64" new:%"PRId64" dur:%d cur:%"PRId64" size:%d\n", pkt->stream_index, old_diff, new_diff, pkt->duration, st->cur_dts, pkt->size);
-                }
-            }
-
             /* presentation is not delayed : PTS and DTS are the same */
             if(pkt->pts == AV_NOPTS_VALUE)
                 pkt->pts = pkt->dts;



More information about the ffmpeg-cvslog mailing list