summaryrefslogtreecommitdiffstats
path: root/demux/aviheader.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-16 22:07:48 +0200
committerwm4 <wm4@nowhere>2013-06-16 22:07:48 +0200
commitd81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6 (patch)
tree0d50b238c1a798db9ef09838800c99653c06e408 /demux/aviheader.c
parent4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (diff)
parentf794444309a826478fefa00bf13d660793066b81 (diff)
downloadmpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.bz2
mpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.xz
Merge branch 'cache_new'
Diffstat (limited to 'demux/aviheader.c')
-rw-r--r--demux/aviheader.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/demux/aviheader.c b/demux/aviheader.c
index 2226be25d4..c1b9c59692 100644
--- a/demux/aviheader.c
+++ b/demux/aviheader.c
@@ -479,7 +479,6 @@ if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) {
// read the standard indices
for (cx = &priv->suidx[0], i=0; i<priv->suidx_size; cx++, i++) {
- stream_reset(demuxer->stream);
for (j=0; j<cx->nEntriesInUse; j++) {
int ret1, ret2;
memset(&cx->stdidx[j], 0, 32);
@@ -543,7 +542,6 @@ if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) {
{
uint32_t id;
uint32_t db = 0;
- stream_reset (demuxer->stream);
// find out the video stream id. I have seen files with 01db.
for (idx = &((AVIINDEXENTRY *)priv->idx)[0], i=0; i<priv->idx_size; i++, idx++){
@@ -590,7 +588,6 @@ freeout:
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_size=0;