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
|
From c03b7f91b1ae407cb777ff4d18a8513c0030bf57 Mon Sep 17 00:00:00 2001
From: John Stebbins <stebbins@jetheaddev.com>
Date: Mon, 27 Feb 2017 11:53:11 -0700
Subject: [PATCH] avidec: handle broken AVI index better
A broken index that causes non-interleaved access and has a packet size
of 0 causes an infinite loop reading 0 bytes. Switch to assuming file
is interleaved if a broken index is detected.
---
libavformat/avidec.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 870066e..a44ad87 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1146,7 +1146,6 @@ static int ni_prepare_read(AVFormatContext *s)
if (i >= 0) {
int64_t pos = best_st->index_entries[i].pos;
pos += best_ast->packet_size - best_ast->remaining;
- avio_seek(s->pb, pos + 8, SEEK_SET);
assert(best_ast->remaining <= best_ast->packet_size);
@@ -1154,6 +1153,14 @@ static int ni_prepare_read(AVFormatContext *s)
if (!best_ast->remaining)
best_ast->packet_size =
best_ast->remaining = best_st->index_entries[i].size;
+ if (!best_ast->remaining) {
+ /* broken index, assume the rest is non-interleaved */
+ av_log(s, AV_LOG_ERROR, "Broken AVI index.\n");
+ avi->stream_index = -1;
+ avi->non_interleaved = 0;
+ } else {
+ avio_seek(s->pb, pos + 8, SEEK_SET);
+ }
}
return 0;
--
2.9.3
|
