From a03e58ee5370c68c707723ebcccda0782b92f176 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 2 Nov 2008 16:41:55 +0100 Subject: [PATCH] Fixed ES_OUT_SET_DEFAULT name (added ES_). --- include/vlc_es_out.h | 2 +- modules/demux/mkv/matroska_segment.cpp | 2 +- src/input/es_out.c | 2 +- src/input/input.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h index 9afef8e4c1..d7fb754d5b 100644 --- a/include/vlc_es_out.h +++ b/include/vlc_es_out.h @@ -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 */ diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp index 26ed799502..46cc5e6303 100644 --- a/modules/demux/mkv/matroska_segment.cpp +++ b/modules/demux/mkv/matroska_segment.cpp @@ -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 ); } } diff --git a/src/input/es_out.c b/src/input/es_out.c index fcb7d4e8b3..34f2ffca86 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -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 * ); diff --git a/src/input/input.c b/src/input/input.c index 4ce6b5c046..a8729a4172 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -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 ); } -- 2.39.2