diff options
| author | wm4 <wm4@nowhere> | 2013-06-06 20:39:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-16 22:05:09 +0200 |
| commit | 1c35794efd7d025457e527b61f7c23fe375c2f5a (patch) | |
| tree | f9c38b117b3b3e05ee8db67310762b42c4de17ab /demux/aviheader.c | |
| parent | 7fefad7a8f2e45fcab60b400a63c43097ad6c681 (diff) | |
| download | mpv-1c35794efd7d025457e527b61f7c23fe375c2f5a.tar.bz2 mpv-1c35794efd7d025457e527b61f7c23fe375c2f5a.tar.xz | |
stream: remove stream_reset()
This function was called in various places. Most time, it was used
before a seek. In other cases, the purpose was apparently resetting
the EOF flag. As far as I can see, this makes no sense anymore. At
least the stream_reset() calls paired with stream_seek() are completely
pointless. A seek will either seek inside the buffer (and reset the
EOF flag), or do an actual seek and reset all state.
Diffstat (limited to 'demux/aviheader.c')
| -rw-r--r-- | demux/aviheader.c | 3 |
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; |