Mercurial > libavformat.hg

changeset 1925:9012fcda4257 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Sat, 17 Mar 2007 02:03:59 +0000
parents 3983fe904b71
children 5e66b1924b43
files utils.c
diffstat 1 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Sat Mar 17 01:21:40 2007 +0000
+++ b/utils.c	Sat Mar 17 02:03:59 2007 +0000
@@ -618,21 +618,16 @@
     if (presentation_delayed) {
         /* DTS = decompression time stamp */
         /* PTS = presentation time stamp */
-        if (pkt->dts == AV_NOPTS_VALUE) {
-            /* if we know the last pts, use it */
-            if(st->last_IP_pts != AV_NOPTS_VALUE)
-                st->cur_dts = pkt->dts = st->last_IP_pts;
-            else
-                pkt->dts = st->cur_dts;
-        } else {
-            st->cur_dts = pkt->dts;
-        }
+        if (pkt->dts == AV_NOPTS_VALUE)
+            pkt->dts = st->last_IP_pts;
+        if (pkt->dts == AV_NOPTS_VALUE)
+            pkt->dts = st->cur_dts;
+
         /* this is tricky: the dts must be incremented by the duration
            of the frame we are displaying, i.e. the last I or P frame */
         if (st->last_IP_duration == 0)
-            st->cur_dts += pkt->duration;
-        else
-            st->cur_dts += st->last_IP_duration;
+            st->last_IP_duration = pkt->duration;
+        st->cur_dts = pkt->dts + st->last_IP_duration;
         st->last_IP_duration  = pkt->duration;
         st->last_IP_pts= pkt->pts;
         /* cannot compute PTS if not present (we can compute it only