[Ffmpeg-cvslog] r7877 - trunk/libavformat/asf-enc.c

[michael]

Author: michael
Date: Wed Feb  7 23:26:48 2007
New Revision: 7877

Modified:
   trunk/libavformat/asf-enc.c

Log:
muxing packets with unknown timestamps is not allowed


Modified: trunk/libavformat/asf-enc.c
==============================================================================
--- trunk/libavformat/asf-enc.c	(original)
+++ trunk/libavformat/asf-enc.c	Wed Feb  7 23:26:48 2007
@@ -725,16 +725,8 @@
 
     //XXX /FIXME use duration from AVPacket (quick hack by)
     pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
-    if (pts == AV_NOPTS_VALUE) {
-        if (codec->codec_type == CODEC_TYPE_AUDIO) {
-            duration = (codec->frame_number * (int64_t)codec->frame_size * INT64_C(10000000)) /
-                codec->sample_rate;
-        } else {
-            duration = av_rescale(codec->frame_number * (int64_t)codec->time_base.num, 10000000, codec->time_base.den);
-        }
-    } else {
-        duration = pts * 10000;
-    }
+    assert(pts != AV_NOPTS_VALUE);
+    duration = pts * 10000;
     asf->duration= FFMAX(asf->duration, duration);
 
     packet_st = asf->nb_packets;