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 /core/asxparser.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 'core/asxparser.c')
| -rw-r--r-- | core/asxparser.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/asxparser.c b/core/asxparser.c index 17ce6b3e8c..0fc10eb059 100644 --- a/core/asxparser.c +++ b/core/asxparser.c @@ -451,7 +451,6 @@ asx_parse_ref(ASX_Parser_t* parser, char** attribs) { static void asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs) { char *href; stream_t* stream; - int f=DEMUXER_TYPE_UNKNOWN; if(parser->deep > 0) return; @@ -461,7 +460,7 @@ static void asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs asx_warning_attrib_required(parser,"ENTRYREF" ,"HREF" ); return; } - stream=open_stream(href,0,&f); + stream=stream_open(href, NULL); if(!stream) { mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Can't open playlist %s\n",href); free(href); |