[SCM] libav/experimental: preroll is in ms pts should start at start_time

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6c55fd796838192332a5840e62dbc7c0ab22fe7e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Dec 22 03:04:21 2004 +0000

    preroll is in ms
    pts should start at start_time
    
    Originally committed as revision 3771 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index b7ae087..cde3054 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -196,9 +196,9 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             if (!asf_st)
                 goto fail;
             st->priv_data = asf_st;
-            st->start_time = asf->hdr.preroll / (10000000 / AV_TIME_BASE);
-	    st->duration = (asf->hdr.send_time - asf->hdr.preroll) / 
-                (10000000 / AV_TIME_BASE);
+            st->start_time = asf->hdr.preroll * (int64_t)AV_TIME_BASE / 1000;
+            st->duration = asf->hdr.send_time / 
+                (10000000 / AV_TIME_BASE) - st->start_time;
             get_guid(pb, &g);
             if (!memcmp(&g, &audio_stream, sizeof(GUID))) {
                 type = CODEC_TYPE_AUDIO;
@@ -599,7 +599,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
 	    /* new packet */
 	    av_new_packet(&asf_st->pkt, asf->packet_obj_size);
 	    asf_st->seq = asf->packet_seq;
-	    asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll;
+	    asf_st->pkt.pts = asf->packet_frag_timestamp;
 	    asf_st->pkt.stream_index = asf->stream_index;
             asf_st->packet_pos= asf->packet_pos;            
 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", 

-- 
Libav/FFmpeg packaging