summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-14 22:47:38 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-14 22:47:38 +0000
commit65cbd8d81be759984d628154e2919bbbea05b606 (patch)
treee033e9d2fc3312b8a3f512f2cb5eec36449c3740 /libmpdemux
parent636c556f4e385736085583410904253c2f47183d (diff)
downloadmpv-65cbd8d81be759984d628154e2919bbbea05b606.tar.bz2
mpv-65cbd8d81be759984d628154e2919bbbea05b606.tar.xz
Always try to parse index chunk, no reason to check for movi_end
Also check return value of parse_index_chunk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17395 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_real.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index d9d992c0bf..db56fb4625 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1748,16 +1748,14 @@ header_end:
switch (index_mode){
case -1: // untouched
- if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
+ if (priv->index_chunk_offset && parse_index_chunk(demuxer))
{
- parse_index_chunk(demuxer);
demuxer->seekable = 1;
}
break;
case 1: // use (generate index)
- if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
+ if (priv->index_chunk_offset && parse_index_chunk(demuxer))
{
- parse_index_chunk(demuxer);
demuxer->seekable = 1;
} else {
generate_index(demuxer);