diff options
author | wm4 <wm4@nowhere> | 2013-07-11 21:10:42 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-12 21:56:40 +0200 |
commit | 52c3eb69765a0d1070bf240353095c8ff546765b (patch) | |
tree | db654a9798f4941dbc3b57c8569fcdeb0b21d24a /stream/stream_tv.c | |
parent | d17d2fdc7c536821b3fea8c4a37c0ad09fc487db (diff) | |
download | mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.bz2 mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.xz |
core: change open_stream and demux_open signature
This removes the dependency on DEMUXER_TYPE_* and the file_format
parameter from the stream open functions.
Remove some of the playlist handling code. It looks like this was
needed only for loading linked mov files with demux_mov (which was
removed long ago).
Delete a minor bit of dead network-related code from stream.c as well.
Diffstat (limited to 'stream/stream_tv.c')
-rw-r--r-- | stream/stream_tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 595657dc43..eacdabd705 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -97,13 +97,13 @@ tv_stream_close (stream_t *stream) stream->priv=NULL; } static int -tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format) +tv_stream_open (stream_t *stream, int mode, void *opts) { stream->type = STREAMTYPE_TV; stream->priv = opts; stream->close=tv_stream_close; - *file_format = DEMUXER_TYPE_TV; + stream->demuxer = "tv"; return STREAM_OK; } |