[FFmpeg-cvslog] r23509 - trunk/libavformat/rmdec.c
reimar
subversion
Sun Jun 6 20:48:49 CEST 2010
Author: reimar
Date: Sun Jun 6 20:48:49 2010
New Revision: 23509
Log:
Do not read the RM index when input is streamed (since it requires seeking
forward and then back again) or AVFMT_FLAG_IGNIDX is set.
Modified:
trunk/libavformat/rmdec.c
Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c Sun Jun 6 20:29:42 2010 (r23508)
+++ trunk/libavformat/rmdec.c Sun Jun 6 20:48:49 2010 (r23509)
@@ -481,7 +481,8 @@ static int rm_read_header(AVFormatContex
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);
}
More information about the ffmpeg-cvslog
mailing list