diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
| commit | efcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch) | |
| tree | eb15edb75377eedd5d7397209e8c0d594020663e /libmpdemux | |
| parent | 1598302be65c77c107330dc46fd0dabface3112d (diff) | |
| parent | 8fcbe5835d038649e70da410d46c4f5cd502c261 (diff) | |
| download | mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2 mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz | |
Merge svn changes up to r30055
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/aviheader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index a7b2b2c434..230e769fe0 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -632,11 +632,11 @@ if (index_file_load) { } gen_index: if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ + int idx_pos = 0; // build index for file: stream_reset(demuxer->stream); stream_seek(demuxer->stream,demuxer->movi_start); - priv->idx_pos=0; priv->idx_size=0; priv->idx=NULL; @@ -657,13 +657,13 @@ if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ if(stream_eof(demuxer->stream)) break; if(!id || avi_stream_id(id)==100) goto skip_chunk; // bad ID (or padding?) - if(priv->idx_pos>=priv->idx_size){ + if(idx_pos>=priv->idx_size){ // priv->idx_size+=32; priv->idx_size+=1024; // +16kB priv->idx=realloc(priv->idx,priv->idx_size*sizeof(AVIINDEXENTRY)); - if(!priv->idx){priv->idx_pos=0; break;} // error! + if(!priv->idx){idx_pos=0; break;} // error! } - idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++]; + idx=&((AVIINDEXENTRY *)priv->idx)[idx_pos++]; idx->ckid=id; idx->dwFlags=AVIIF_KEYFRAME; // FIXME idx->dwFlags|=(demuxer->filepos>>16)&0xffff0000U; @@ -713,7 +713,7 @@ skip_chunk: skip=(len+1)&(~1UL); // total bytes in this chunk stream_seek(demuxer->stream,8+demuxer->filepos+skip); } - priv->idx_size=priv->idx_pos; + priv->idx_size=idx_pos; mp_tmsg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size); if( mp_msg_test(MSGT_HEADER,MSGL_DBG2) ) print_index(priv->idx,priv->idx_size,MSGL_DBG2); |