1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Index: libavformat/avidec.c
===================================================================
--- ffmpeg.orig/libavformat/avidec.c (revision 22950)
+++ ffmpeg/libavformat/avidec.c (working copy)
@@ -1072,7 +1072,7 @@
AVIContext *avi = s->priv_data;
AVStream *st;
int i, index;
- int64_t pos;
+ int64_t pos, min_pos;
AVIStream *ast;
if (!avi->index_loaded) {
@@ -1109,6 +1109,7 @@
return 0;
}
+ min_pos = pos;
for(i = 0; i < s->nb_streams; i++) {
AVStream *st2 = s->streams[i];
AVIStream *ast2 = st2->priv_data;
@@ -1129,10 +1130,20 @@
index=0;
if(!avi->non_interleaved){
- while(index>0 && st2->index_entries[index].pos > pos)
- index--;
- while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
- index++;
+ if (flags & AVSEEK_FLAG_BACKWARD) {
+ while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
+ index++;
+ while(index>0 && st2->index_entries[index].pos > pos)
+ index--;
+ if (st2->index_entries[index].pos < min_pos)
+ min_pos = st2->index_entries[index].pos;
+ }
+ else {
+ while(index>0 && st2->index_entries[index].pos > pos)
+ index--;
+ while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
+ index++;
+ }
}
// av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %"PRId64"\n", timestamp, index, st2->index_entries[index].timestamp);
@@ -1141,7 +1152,7 @@
}
/* do the seek */
- url_fseek(s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, min_pos, SEEK_SET);
avi->stream_index= -1;
return 0;
}
|
