Fixed ES_OUT_SET_DEFAULT name (added ES_).

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 9afef8e4c1f64a1354632072e09ae1e2f1435f9c..d7fb754d5b072a5ab9e02e9856ea153226a674b0 100644 (file)
--- 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 26ed7995020503bfc6c13374c86e5206f306396b..46cc5e6303647fd021b31f06aa25b09ad0d71372 100644 (file)
--- 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 fcb7d4e8b38256a755bc0c9996e1624245ee7082..34f2ffca869a86b8b3a8dfe53a3bf06398bee640 100644 (file)
--- 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 4ce6b5c046eb4d8a63c6f668b9a6475353c777bf..a8729a4172c60ab0dcfaa00639c56380ac5fa0d5 100644 (file)
--- 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 );
         }