[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 14eb3345baa6cd90fce6fa76401153c6e5ada98e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Mar 17 02:03:59 2007 +0000

    simplify
    
    Originally committed as revision 8427 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 057493a..3c175a6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -618,21 +618,16 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
     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

-- 
Libav/FFmpeg packaging