diff options
| author | wm4 <wm4@nowhere> | 2013-07-07 20:49:15 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-07 21:10:44 +0200 |
| commit | c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2 (patch) | |
| tree | 31ae282e119a8de906997afb6ab4d6b5f3ea264d /stream/stream_lavf.c | |
| parent | dbf2a6f7d0a9ae09bac024cf3ad4e7b27d303cb6 (diff) | |
| download | mpv-c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2.tar.bz2 mpv-c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2.tar.xz | |
stream: remove weird STREAMTYPE_STREAM special handling
This was an old leftover from an earlier cleanup (which happened in
2003), and which used "special" stuff for streams that could be only
forward-seeked.
Also, don't add mode flags to s->flags; they're supposed to be in
s->mode instead.
Diffstat (limited to 'stream/stream_lavf.c')
| -rw-r--r-- | stream/stream_lavf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 3223bc3eaa..9a5249db54 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -162,7 +162,6 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) /* This is handled as a special demuxer, without a separate * stream layer. demux_lavf will do all the real work. */ - stream->type = STREAMTYPE_STREAM; stream->seek = NULL; *file_format = DEMUXER_TYPE_LAVF; stream->lavf_type = "rtsp"; @@ -226,10 +225,8 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) stream->end_pos = size; stream->type = STREAMTYPE_FILE; stream->seek = seek; - if (!avio->seekable) { - stream->type = STREAMTYPE_STREAM; + if (!avio->seekable) stream->seek = NULL; - } stream->fill_buffer = fill_buffer; stream->write_buffer = write_buffer; stream->control = control; |