Removed now useless es_out_t::b_sout field.

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 78d31680b939c88d9490fd45b0dcb782bccc3c77..3d25e40b29a70e7a5180a3ba54deb16ab69d89a9 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -101,8 +101,6 @@ struct es_out_t
     int          (*pf_control)( es_out_t *, int i_query, va_list );
     void         (*pf_destroy)( es_out_t * );
 
-    bool         b_sout;
-
     es_out_sys_t    *p_sys;
 };
 

diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
index 7eb17bf785c6573223dda84f3296e39d06c49a12..5c61970e1720861f8e057df8b21346b4538dcd7e 100644 (file)
--- a/modules/access/bd/bd.c
+++ b/modules/access/bd/bd.c
@@ -1343,7 +1343,6 @@ static es_out_t *EsOutNew( demux_t *p_demux )
     p_out->pf_del     = EsOutDel;
     p_out->pf_control = EsOutControl;
     p_out->pf_destroy = EsOutDestroy;
-    p_out->b_sout = false;
 
     p_out->p_sys = p_sys = malloc( sizeof(*p_sys) );
     if( !p_sys )

diff --git a/src/input/es_out.c b/src/input/es_out.c
index b76e27626a5028c284627d8f4374dc9e699dad05..8e7419aaac84954ce0944b5cf346dff18f2cffc4 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -237,8 +237,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
     out->pf_control = EsOutControl;
     out->pf_destroy = EsOutDelete;
     out->p_sys      = p_sys;
-    out->b_sout     = false; /* It has no meaning here, and p_input->p->p_sout is not yet valid */
-
 
     vlc_mutex_init_recursive( &p_sys->lock );
     p_sys->p_input = p_input;

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index a63256ef3c56d6cd4ce87ebb61f195f6cc4933d1..d6502349d36aa1b098b08d525bd87f17de741e42 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -307,7 +307,6 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out
     p_out->pf_control = Control;
     p_out->pf_destroy = Destroy;
     p_out->p_sys      = p_sys;
-    p_out->b_sout     = p_input->p->p_sout != NULL;
 
     /* */
     p_sys->b_input_paused = false;