Commit 473237f3 authored by François Cartegnie's avatar François Cartegnie 🤞

demux: adaptive: do not filter schemes

also fixes a mishandled exception.
let late fail on regular access creation.
parent 50541d21
......@@ -196,13 +196,10 @@ bool AbstractStream::startDemux()
if(demuxer)
return false;
try
{
demuxersource->Reset();
demuxer = createDemux(format);
} catch(int) {
demuxersource->Reset();
demuxer = createDemux(format);
if(!demuxer)
msg_Err(p_realdemux, "Failed to create demuxer");
}
return !!demuxer;
}
......
......@@ -125,7 +125,7 @@ HTTPChunkSource::HTTPChunkSource(const std::string& url, HTTPConnectionManager *
prepared = false;
eof = false;
if(!init(url))
throw VLC_EGENERIC;
eof = true;
}
HTTPChunkSource::~HTTPChunkSource()
......
......@@ -96,6 +96,11 @@ AbstractConnection * HTTPConnectionManager::getConnection(ConnectionParams &para
if(!conn)
{
conn = factory->createConnection(p_object, params);
if(!conn)
{
vlc_mutex_unlock(&lock);
return NULL;
}
connectionPool.push_back(conn);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment