diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 10:56:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 10:57:20 +0200 |
| commit | c16470d77a1b693ea573e2925c3488847c5db939 (patch) | |
| tree | 93b435242e547255018274a8c711d813318450b5 /libavformat | |
| parent | f6622f9610af513bc3277da09dcd2d9777f00343 (diff) | |
| parent | 5f408333601a827054335f309defcb246a532b21 (diff) | |
| download | ffmpeg-c16470d77a1b693ea573e2925c3488847c5db939.tar.gz | |
Merge commit '5f408333601a827054335f309defcb246a532b21'
* commit '5f408333601a827054335f309defcb246a532b21':
asfdec: substract preroll time from marker presentation time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 9f49c12724..72865c1441 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -679,6 +679,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]; @@ -696,6 +697,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 |