Commit dd166718 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: adaptative: don't call method in constructor

parent f28eab72
...@@ -62,9 +62,6 @@ Demuxer::Demuxer(demux_t *p_realdemux_, const std::string &name_, es_out_t *out, ...@@ -62,9 +62,6 @@ Demuxer::Demuxer(demux_t *p_realdemux_, const std::string &name_, es_out_t *out,
{ {
b_startsfromzero = true; b_startsfromzero = true;
} }
if(!create())
throw VLC_EGENERIC;
} }
Demuxer::~Demuxer() Demuxer::~Demuxer()
......
...@@ -49,6 +49,13 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format) ...@@ -49,6 +49,13 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
case StreamFormat::UNSUPPORTED: case StreamFormat::UNSUPPORTED:
break; break;
} }
if(ret && !ret->create())
{
delete ret;
ret = NULL;
}
return ret; return ret;
} }
......
...@@ -67,6 +67,13 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format) ...@@ -67,6 +67,13 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
case StreamFormat::UNSUPPORTED: case StreamFormat::UNSUPPORTED:
break; break;
} }
if(ret && !ret->create())
{
delete ret;
ret = NULL;
}
return ret; return ret;
} }
......
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