diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-12-22 03:04:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-12-22 03:04:21 +0000 |
| commit | 6c55fd796838192332a5840e62dbc7c0ab22fe7e (patch) | |
| tree | 9338811d844223005c72ad0ec527e11611e26fbf | |
| parent | 5375644323cfda3f997f7d8512dddaa88c34db01 (diff) | |
| download | ffmpeg-6c55fd796838192332a5840e62dbc7c0ab22fe7e.tar.gz | |
preroll is in ms
pts should start at start_time
Originally committed as revision 3771 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/asf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index b7ae087fe5..cde3054592 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", |