From 1c35794efd7d025457e527b61f7c23fe375c2f5a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 6 Jun 2013 20:39:58 +0200
Subject: 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.
---
 demux/aviheader.c  | 3 ---
 demux/demux_asf.c  | 1 -
 demux/demux_avi.c  | 1 -
 demux/demux_lavf.c | 1 -
 demux/demux_ts.c   | 5 -----
 5 files changed, 11 deletions(-)

(limited to 'demux')

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;
diff --git a/demux/demux_asf.c b/demux/demux_asf.c
index 0b8da6930f..f800e09dc3 100644
--- a/demux/demux_asf.c
+++ b/demux/demux_asf.c
@@ -628,7 +628,6 @@ static demuxer_t* demux_open_asf(demuxer_t* demuxer)
     init_priv(asf);
     if (!read_asf_header(demuxer,asf))
         return NULL;
-    stream_reset(demuxer->stream);
     stream_seek(demuxer->stream,demuxer->movi_start);
 //    demuxer->idx_pos=0;
 //    demuxer->endpos=avi_header.movi_end;
diff --git a/demux/demux_avi.c b/demux/demux_avi.c
index daf542bfac..a07f022cde 100644
--- a/demux/demux_avi.c
+++ b/demux/demux_avi.c
@@ -456,7 +456,6 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
       demuxer->video->id=-1; // autodetect
   }
 
-  stream_reset(demuxer->stream);
   stream_seek(demuxer->stream,demuxer->movi_start);
   if(priv->idx_size>1){
     // decide index format:
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index efe8edd43c..53f583570f 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -143,7 +143,6 @@ static int64_t mp_seek(void *opaque, int64_t pos, int whence)
         return -1;
     current_pos = stream_tell(stream);
     if (stream_seek(stream, pos) == 0) {
-        stream_reset(stream);
         stream_seek(stream, current_pos);
         return -1;
     }
diff --git a/demux/demux_ts.c b/demux/demux_ts.c
index 8b2a2d84ba..a16891907d 100644
--- a/demux/demux_ts.c
+++ b/demux/demux_ts.c
@@ -470,7 +470,6 @@ static int ts_check_file(demuxer_t * demuxer)
 		if(_read < buf_size-1)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_V, "COULDN'T READ ENOUGH DATA, EXITING TS_CHECK\n");
-			stream_reset(demuxer->stream);
 			return 0;
 		}
 
@@ -992,9 +991,6 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer)
 	demuxer->type= DEMUXER_TYPE_MPEG_TS;
         demuxer->ts_resets_possible = true;
 
-
-	stream_reset(demuxer->stream);
-
 	packet_size = ts_check_file(demuxer);
 	if(!packet_size)
 	    return NULL;
@@ -1079,7 +1075,6 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer)
                     start_pos - priv->ts.packet_size;
 	demuxer->movi_start = start_pos;
 	demuxer->reference_clock = MP_NOPTS_VALUE;
-	stream_reset(demuxer->stream);
 	stream_seek(demuxer->stream, start_pos);	//IF IT'S FROM A PIPE IT WILL FAIL, BUT WHO CARES?
 
 
-- 
cgit v1.2.3