1 From 4bcec3ef0042244b0ade00d132368d0872f73c72 Mon Sep 17 00:00:00 2001
2 From: Joakim Plate <elupus@ecce.se>
3 Date: Wed, 8 Dec 2010 14:03:43 +0000
4 Subject: [PATCH 09/13] changed: allow 4 second skew between streams in mov
5 before attempting to seek
7 Patch part of the XBMC patch set for ffmpeg, downloaded from
8 https://github.com/xbmc/FFmpeg/.
10 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 libavformat/mov.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
16 diff --git a/libavformat/mov.c b/libavformat/mov.c
17 index 8d66c0a..127ffd9 100644
18 --- a/libavformat/mov.c
19 +++ b/libavformat/mov.c
20 @@ -4028,8 +4028,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
21 if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) ||
23 ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb &&
24 - ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
25 - (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) {
26 + ((FFABS(best_dts - dts) <= 4*AV_TIME_BASE && current_sample->pos < sample->pos) ||
27 + (FFABS(best_dts - dts) > 4*AV_TIME_BASE && dts < best_dts)))))) {
28 sample = current_sample;