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/demux_ts.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/demux_ts.c')
| -rw-r--r-- | demux/demux_ts.c | 5 |
1 files changed, 0 insertions, 5 deletions
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? |