Merge branch 'remove_old_demuxers'

The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.

Conflicts:
	stream/stream.c

1 files changed, 1 insertions, 3 deletions

diff --git a/core/asxparser.c b/core/asxparser.c
index 17ce6b3e8c..ec15313547 100644
--- a/core/asxparser.c
+++ b/core/asxparser.c
@@ -27,7 +27,6 @@
 #include "playlist.h"
 #include "playlist_parser.h"
 #include "stream/stream.h"
-#include "demux/demux.h"
 #include "asxparser.h"
 #include "core/mp_msg.h"
 
@@ -451,7 +450,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 +459,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);