Commit a03e58ee authored by Laurent Aimar's avatar Laurent Aimar

Fixed ES_OUT_SET_DEFAULT name (added ES_).

parent c2f9cc44
......@@ -58,7 +58,7 @@ enum es_out_query_e
ES_OUT_RESTART_ES, /* arg1= es_out_id_t* */
/* set 'default' tag on ES (copied across from container) */
ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t* */
ES_OUT_SET_ES_DEFAULT, /* arg1= es_out_id_t* */
/* force selection/unselection of the ES (bypass current mode) */
ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=bool */
......
......@@ -1094,7 +1094,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
if( tracks[i_track]->b_default )
{
es_out_Control( sys.demuxer.out,
ES_OUT_SET_DEFAULT,
ES_OUT_SET_ES_DEFAULT,
tracks[i_track]->p_es );
}
}
......
......@@ -2100,7 +2100,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
return VLC_SUCCESS;
}
case ES_OUT_SET_DEFAULT:
case ES_OUT_SET_ES_DEFAULT:
{
es = (es_out_id_t*) va_arg( args, es_out_id_t * );
......
......@@ -3112,7 +3112,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
input_EsOutLock( p_input->p->p_es_out );
es_out_id_t *p_es = input_EsOutGetFromID( p_input->p->p_es_out, i_id );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_DEFAULT, p_es );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES_DEFAULT, p_es );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES, p_es );
input_EsOutUnlock( p_input->p->p_es_out );
}
......
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