Commit 5151a5d2 authored by Francois Cartegnie's avatar Francois Cartegnie

Revert "demux: ogg: don't recreate decoders on same chained streams."

This reverts commit 1f9c3427.
parent 4a2c11ff
......@@ -1296,9 +1296,9 @@ static void Ogg_DecodePacket( demux_t *p_demux,
p_block->i_buffer = 0;
}
if ( p_stream->b_reusing_with_other_fmt )
if ( p_stream->b_reusing )
{
p_stream->b_reusing_with_other_fmt = false;
p_stream->b_reusing = false;
p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
}
......@@ -1872,19 +1872,13 @@ static void Ogg_CreateES( demux_t *p_demux )
p_stream->b_finished = false;
p_stream->b_reinit = false;
p_stream->b_initializing = false;
p_stream->b_reusing = true;
es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt );
if ( !es_format_IsSimilar( &p_stream->fmt_old, &p_old_stream->fmt ) )
{
msg_Dbg( p_demux, "recreating decoders using SET_FMT" );
es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
p_stream->p_es, &p_stream->fmt );
p_stream->b_reusing_with_other_fmt = true;
}
p_old_stream->p_es = NULL;
p_old_stream = NULL;
es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
p_stream->p_es, &p_stream->fmt );
}
else
{
......@@ -1909,8 +1903,6 @@ static void Ogg_CreateES( demux_t *p_demux )
}
}
/****************************************************************************
* Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
* Elementary streams.
......
......@@ -75,7 +75,7 @@ typedef struct logical_stream_s
bool b_initializing;
bool b_finished;
bool b_reinit;
bool b_reusing_with_other_fmt;
bool b_reusing;
bool b_oggds;
int i_granule_shift;
......
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