[FFmpeg-cvslog] asfdec: also subtract preroll when reading simple index object

Vladimir Pantelic git at videolan.org
Thu Mar 24 03:43:42 CET 2011


ffmpeg | branch: master | Vladimir Pantelic <vladoman at gmail.com> | Thu Mar 17 22:34:52 2011 +0100| [4377fafda100117f75d62ba91bce6d8509e01a50] | committer: Mans Rullgard

asfdec: also subtract preroll when reading simple index object

This was missed when ASF was changed to return timestamps
without preroll.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4377fafda100117f75d62ba91bce6d8509e01a50
---

 libavformat/asfdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 15dc55b..14ef2a5 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1219,10 +1219,10 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index)
             int pktnum=avio_rl32(s->pb);
             int pktct =avio_rl16(s->pb);
             int64_t pos      = s->data_offset + s->packet_size*(int64_t)pktnum;
-            int64_t index_pts= av_rescale(itime, i, 10000);
+            int64_t index_pts= FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0);
 
             if(pos != last_pos){
-            av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d\n", pktnum, pktct);
+            av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d  pts: %"PRId64"\n", pktnum, pktct, index_pts);
             av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME);
             last_pos=pos;
             }




More information about the ffmpeg-cvslog mailing list