[FFmpeg-cvslog] r16982 - trunk/libavformat/utils.c

[bcoudurier]

Author: bcoudurier
Date: Wed Feb  4 00:18:12 2009
New Revision: 16982

Log:
let packet pass through when no timestamps

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Wed Feb  4 00:11:13 2009	(r16981)
+++ trunk/libavformat/utils.c	Wed Feb  4 00:18:12 2009	(r16982)
@@ -2614,6 +2614,9 @@ int ff_interleave_compare_dts(AVFormatCo
     int64_t left = st2->time_base.num * (int64_t)st ->time_base.den;
     int64_t right= st ->time_base.num * (int64_t)st2->time_base.den;
 
+    if (pkt->dts == AV_NOPTS_VALUE)
+        return 0;
+
     return next->dts * left > pkt->dts * right; //FIXME this can overflow
 }
 
@@ -2676,7 +2679,7 @@ int av_interleaved_write_frame(AVFormatC
     if(compute_pkt_fields2(st, pkt) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
         return -1;
 
-    if(pkt->dts == AV_NOPTS_VALUE)
+    if(pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
         return -1;
 
     for(;;){