Module: libav Branch: master Commit: 5f408333601a827054335f309defcb246a532b21
Author: Vladimir Pantelic <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Thu Sep 19 17:50:34 2013 +0200 asfdec: substract preroll time from marker presentation time this was forgotten when we changed ASF to not output the preroll time Signed-off-by: Vladimir Pantelic <[email protected]> Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/asfdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index f3978f0..b99cb02 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -672,6 +672,7 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) static int asf_read_marker(AVFormatContext *s, int64_t size) { AVIOContext *pb = s->pb; + ASFContext *asf = s->priv_data; int i, count, name_len, ret; char name[1024]; @@ -689,6 +690,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size) avio_rl64(pb); // offset, 8 bytes pres_time = avio_rl64(pb); // presentation time + pres_time -= asf->hdr.preroll * 10000; avio_rl16(pb); // entry length avio_rl32(pb); // send time avio_rl32(pb); // flags _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
