[Ffmpeg-cvslog] r8426 - trunk/libavformat/utils.c

[michael]

Author: michael
Date: Sat Mar 17 02:21:40 2007
New Revision: 8426

Modified:
   trunk/libavformat/utils.c

Log:
simplify


Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Sat Mar 17 02:21:40 2007
@@ -648,20 +648,12 @@ static void compute_pkt_fields(AVFormatC
         }
 
         /* 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);