[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 41c8a56a1426d8c345ad270fadc37f1217ab8010
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Mar 17 01:21:40 2007 +0000

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d13700e..057493a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -648,20 +648,12 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
         }
 
         /* presentation is not delayed : PTS and DTS are the same */
-        if (pkt->pts == AV_NOPTS_VALUE) {
-            if (pkt->dts == AV_NOPTS_VALUE) {
-                pkt->pts = st->cur_dts;
-                pkt->dts = st->cur_dts;
-            }
-            else {
-                st->cur_dts = pkt->dts;
-                pkt->pts = pkt->dts;
-            }
-        } else {
-            st->cur_dts = pkt->pts;
-            pkt->dts = pkt->pts;
-        }
-        st->cur_dts += pkt->duration;
+        if(pkt->pts == AV_NOPTS_VALUE)
+            pkt->pts = pkt->dts;
+        if(pkt->pts == AV_NOPTS_VALUE)
+            pkt->pts = st->cur_dts;
+        pkt->dts = pkt->pts;
+        st->cur_dts = pkt->pts + pkt->duration;
     }
 //    av_log(NULL, AV_LOG_DEBUG, "OUTdelayed:%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts);
 

-- 
Libav/FFmpeg packaging