Skip to content

V
vlc-2-2
Commit 38c15dd5 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: ogg: apply skeleton prior to es creation too

parent fd8ac505
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
modules/demux/ogg.c
View file @ 38c15dd5
...@@ -336,10 +336,12 @@ static int Demux( demux_t * p_demux ) ...@@ -336,10 +336,12 @@ static int Demux( demux_t * p_demux )
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{ {
logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
if ( p_stream->b_have_updated_format && p_stream->p_es ) if ( p_stream->b_have_updated_format )
{ {
p_stream->b_have_updated_format = false; p_stream->b_have_updated_format = false;
if ( p_stream->p_skel ) Ogg_ApplySkeleton( p_stream ); if ( p_stream->p_skel ) Ogg_ApplySkeleton( p_stream );
if ( p_stream->p_es )
{
msg_Dbg( p_demux, "Resetting format for stream %d", i_stream ); msg_Dbg( p_demux, "Resetting format for stream %d", i_stream );
es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT, es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
p_stream->p_es, &p_stream->fmt ); p_stream->p_es, &p_stream->fmt );
...@@ -347,6 +349,7 @@ static int Demux( demux_t * p_demux ) ...@@ -347,6 +349,7 @@ static int Demux( demux_t * p_demux )
} }
} }
} }
}
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{ {
......
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