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_avdevice.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_avdevice.c')
| -rw-r--r-- | stream/stream_avdevice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c index e26d5a9060..bd342e1b10 100644 --- a/stream/stream_avdevice.c +++ b/stream/stream_avdevice.c @@ -26,15 +26,15 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len) return -1; } -static int open_f(stream_t *stream, int mode, void *opts, int *file_format) +static int open_f(stream_t *stream, int mode, void *opts) { if (mode != STREAM_READ) return STREAM_ERROR; stream->fill_buffer = fill_buffer; stream->type = STREAMTYPE_AVDEVICE; + stream->demuxer = "lavf"; - *file_format = DEMUXER_TYPE_LAVF; return STREAM_OK; } |