Skip to content

V
vlc
Commit 25575cbe authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: adaptative: always drop buffers on seek

parent a7754051
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
modules/demux/adaptative/Streams.cpp
View file @ 25575cbe
...@@ -390,9 +390,7 @@ void BaseStreamOutput::setPosition(mtime_t nztime) ...@@ -390,9 +390,7 @@ void BaseStreamOutput::setPosition(mtime_t nztime)
std::list<Demuxed *>::const_iterator it; std::list<Demuxed *>::const_iterator it;
for(it=queues.begin(); it!=queues.end();++it) for(it=queues.begin(); it!=queues.end();++it)
{ {
Demuxed *pair = *it; (*it)->drop();
if(pair->p_queue && pair->p_queue->i_dts > VLC_TS_0 + nztime)
pair->drop();
} }
/* disable appending until restarted */ /* disable appending until restarted */
b_drop = true; b_drop = true;
...@@ -493,9 +491,12 @@ BaseStreamOutput::Demuxed::~Demuxed() ...@@ -493,9 +491,12 @@ BaseStreamOutput::Demuxed::~Demuxed()
void BaseStreamOutput::Demuxed::drop() void BaseStreamOutput::Demuxed::drop()
{ {
block_ChainRelease(p_queue); if(p_queue)
p_queue = NULL; {
pp_queue_last = &p_queue; block_ChainRelease(p_queue);
p_queue = NULL;
pp_queue_last = &p_queue;
}
} }
/* Static callbacks */ /* Static callbacks */
......
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