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_radio.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_radio.c')
-rw-r--r-- | stream/stream_radio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stream/stream_radio.c b/stream/stream_radio.c index fae9be43d1..7e54cd4274 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -824,7 +824,8 @@ static const radio_driver_t* radio_drivers[]={ * Stream initialization * \return STREAM_OK if success, STREAM_ERROR otherwise */ -static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { +static int open_s(stream_t *stream,int mode, void* opts) +{ radio_priv_t* priv; float frequency=0; int i; @@ -875,7 +876,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { stream->type = STREAMTYPE_RADIO; /* using rawaudio demuxer */ - *file_format = DEMUXER_TYPE_RAWAUDIO; + stream->demuxer = "lavf"; stream->flags = STREAM_READ; priv->radio_fd=-1; |