OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d588e3f
)
Do not read the RM index when input is streamed (since it requires seeking
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 6 Jun 2010 18:48:49 +0000
(18:48 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 6 Jun 2010 18:48:49 +0000
(18:48 +0000)
forward and then back again) or AVFMT_FLAG_IGNIDX is set.
Originally committed as revision 23509 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/rmdec.c
patch
|
blob
|
history
diff --git
a/libavformat/rmdec.c
b/libavformat/rmdec.c
index
a91de13
..
436a7e0
100644
(file)
--- a/
libavformat/rmdec.c
+++ b/
libavformat/rmdec.c
@@
-481,7
+481,8
@@
static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (!data_off)
data_off = url_ftell(pb) - 18;
- if (indx_off && url_fseek(pb, indx_off, SEEK_SET) >= 0) {
+ if (indx_off && !url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX) &&
+ url_fseek(pb, indx_off, SEEK_SET) >= 0) {
rm_read_index(s);
url_fseek(pb, data_off + 18, SEEK_SET);
}