[FFmpeg-cvslog] r12131 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Sun Feb 17 18:55:53 2008
New Revision: 12131

Log:
simplify (next_)pts code


Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Sun Feb 17 18:55:53 2008
@@ -1062,17 +1062,14 @@ static int output_packet(AVInputStream *
         goto handle_eof;
     }
 
+    if(pkt->dts != AV_NOPTS_VALUE)
+        ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
+
     len = pkt->size;
     ptr = pkt->data;
     while (len > 0) {
     handle_eof:
-        if(!pkt || ptr != pkt->data || pkt->dts == AV_NOPTS_VALUE){
-            ist->pts= ist->next_pts; // needed for last packet if vsync=0 and for multi pkt
-        } else if (pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too
-            ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
-        } else {
-    //        assert(ist->pts == ist->next_pts);
-        }
+        ist->pts= ist->next_pts;
 
         /* decode the packet if needed */
         data_buf = NULL; /* fail safe */